aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-24 08:05:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-24 08:05:29 -0700
commit7e125f7b9cbfce4101191b8076d606c517a73066 (patch)
treeded140947b146cc7177519cd23cf81912de32687 /arch
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin (diff)
parentcmd640: fix kernel oops in test_irq() method (diff)
downloadlinux-dev-7e125f7b9cbfce4101191b8076d606c517a73066.tar.xz
linux-dev-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')
0 files changed, 0 insertions, 0 deletions