diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-18 22:04:12 -0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-18 22:04:12 -0200 |
| commit | ddddefa99db4ae54a63dcd737d224bc3cc0f2d8a (patch) | |
| tree | 2223e34469b7d70a2c740b55379fd09ff95257b6 /drivers/net/ethernet/stmicro | |
| parent | e27fc7e476077c724f313a3ddec44ad26c49f678 (diff) | |
| parent | 0ab3d8b3213c8bb55370b11fcc5321ee4f2c5e92 (diff) | |
Merge git://git.kernel.org/pub/scm/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
Diffstat (limited to 'drivers/net/ethernet/stmicro')
0 files changed, 0 insertions, 0 deletions