diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-24 17:05:29 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-24 17:05:29 +0200 |
| commit | 7e125f7b9cbfce4101191b8076d606c517a73066 (patch) | |
| tree | ded140947b146cc7177519cd23cf81912de32687 /arch/arm/kernel/time.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vap... (diff) | |
| parent | cmd640: fix kernel oops in test_irq() method (diff) | |
| download | linux-7e125f7b9cbfce4101191b8076d606c517a73066.tar.xz linux-7e125f7b9cbfce4101191b8076d606c517a73066.zip | |
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
Diffstat (limited to 'arch/arm/kernel/time.c')
0 files changed, 0 insertions, 0 deletions