| commit | 318851b08fb9d426a545f76e56f2cc049831fb40 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Jan 10 14:31:16 2008 -0800 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Jan 10 14:31:16 2008 -0800 |
| tree | a7784215b1ba0564b865309042ed80d3d4b383e6 | |
| parent | d0dc3701cb46f73cf8ca393f62e325065b0bbd03 [diff] | |
| parent | 93c0b5608086a103892aa78b7b83d7ecab60f7ab [diff] |
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