| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 24 May 2010 15:05:29 +0000 (08:05 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 24 May 2010 15:05:29 +0000 (08:05 -0700) | ||
| commit | 7e125f7b9cbfce4101191b8076d606c517a73066 | |
| tree | ded140947b146cc7177519cd23cf81912de32687 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 064e297c324fff9b62226aae5dc468ebb272433c | commit | diff |
| parent | a9ddabc52ce3757a4331d6c1e8bf4065333cc51b | commit | diff |
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
* 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
| include/linux/ide.h | diff1 | | diff2 | | blob | history |