projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 064e297 a9ddabc)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 May 2010 15:05:29 +0000 (08:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 24 May 2010 15:05:29 +0000 (08:05 -0700)
commit7e125f7b9cbfce4101191b8076d606c517a73066
treeded140947b146cc7177519cd23cf81912de32687tree | snapshot
parent064e297c324fff9b62226aae5dc468ebb272433ccommit | diff
parenta9ddabc52ce3757a4331d6c1e8bf4065333cc51bcommit | diff
Merge git://git./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
include/linux/ide.h diff1 | diff2 | blob | history
John Crispins staging tree