| commit | 7e125f7b9cbfce4101191b8076d606c517a73066 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 24 08:05:29 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 24 08:05:29 2010 -0700 |
| tree | ded140947b146cc7177519cd23cf81912de32687 | |
| parent | 064e297c324fff9b62226aae5dc468ebb272433c [diff] | |
| parent | a9ddabc52ce3757a4331d6c1e8bf4065333cc51b [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