| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 19 Nov 2011 00:04:12 +0000 (22:04 -0200) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 19 Nov 2011 00:04:12 +0000 (22:04 -0200) |
* 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
cy82c693: fix PCI device selection
icside: DMA support fix
IDE: Don't powerdown Compaq Triflex IDE device on suspend
piix: ICH7 MWDMA1 errata
Trivial merge