Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Nov 2011 00:04:12 +0000 (22:04 -0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Nov 2011 00:04:12 +0000 (22:04 -0200)
commitddddefa99db4ae54a63dcd737d224bc3cc0f2d8a
tree2223e34469b7d70a2c740b55379fd09ff95257b6
parente27fc7e476077c724f313a3ddec44ad26c49f678
parent0ab3d8b3213c8bb55370b11fcc5321ee4f2c5e92
Merge git://git./linux/kernel/git/davem/ide

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  cy82c693: fix PCI device selection
  icside: DMA support fix
  IDE: Don't powerdown Compaq Triflex IDE device on suspend
  piix: ICH7 MWDMA1 errata