]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit295ce4e4c3ac0ceccc3de35f79ddb33e971f5ffe
treeded140947b146cc7177519cd23cf81912de32687
parent36bcaaac4f87ecd55713b105b2c8157c0d6fb21a
parentb45ff7f533da113cd4aea7db694930ff3257a7f8
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
include/linux/ide.h