]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 10 Jan 2008 22:31:16 +0000 (14:31 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 10 Jan 2008 22:31:16 +0000 (14:31 -0800)
commitd102b66808647c4614f11e3fcc884cdb08c830d2
treea7784215b1ba0564b865309042ed80d3d4b383e6
parent3cd4f977e29ba7f9869c6c0b8eb2097946ee8dca
parentf47f7141a10ee5bdb5c5609157d9a3c0fc8e04a8
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  trm290: do hook dma_host_{on,off} methods (take 2)
  ide: fix cable detection for SATA bridges
  ide: workaround suspend bug for ACPI IDE