projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a4f4d6d
5384657
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
author
Linus Torvalds
<torvalds@linux-foundation.org>
Tue, 9 Dec 2008 03:50:09 +0000
(19:50 -0800)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Tue, 9 Dec 2008 03:50:09 +0000
(19:50 -0800)
* 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"
Trivial merge