projects / profile / common / platform / kernel / linux-artik7.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e27fc7e 0ab3d8b)
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)
* 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


Trivial merge
Domain: System / Kernel;