git » linux-kernel » commit 7e125f7

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6

author Linus Torvalds
2010-05-24 15:05:29 UTC
committer Linus Torvalds
2010-05-24 15:05:29 UTC
parent a9ddabc52ce3757a4331d6c1e8bf4065333cc51b
parent 064e297c324fff9b62226aae5dc468ebb272433c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
  cmd640: fix kernel oops in test_irq() method
  pdc202xx_old: ignore "FIFO empty" bit in test_irq() method
  pdc202xx_old: wire test_irq() method for PDC2026x
  IDE: pass IRQ flags to the IDE core
  ide: fix comment typo in ide.h