]> git.proxmox.com Git - mirror_ubuntu-eoan-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)
commit318851b08fb9d426a545f76e56f2cc049831fb40
treea7784215b1ba0564b865309042ed80d3d4b383e6
parentd0dc3701cb46f73cf8ca393f62e325065b0bbd03
parent93c0b5608086a103892aa78b7b83d7ecab60f7ab
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