From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 19 Nov 2011 00:04:12 +0000 (-0200)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
X-Git-Tag: v3.2-rc3~36
X-Git-Url: https://git.ti.com/gitweb?p=sitara-epos%2Fsitara-epos-kernel.git;a=commitdiff_plain;h=ddddefa99db4ae54a63dcd737d224bc3cc0f2d8a

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
---

ddddefa99db4ae54a63dcd737d224bc3cc0f2d8a