| commit | 7f336bf1e59a0d49ffc178a5747ed7da25c6a6a3 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Dec 08 19:50:09 2008 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Dec 08 19:50:09 2008 -0800 |
| tree | 5da1a4088901063a04a6ee269d7195da6178a533 | |
| parent | a4f4d6df537368297a84e6b9444f403f99bf59f6 [diff] | |
| parent | 53846574799884a04a4498f6342400d5c1423c79 [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: ide: build-fix for CONFIG_BLK_DEV_IDEDMA_PMAC=n Revert "ide: respect current DMA setting during resume"