git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
543899f
0b13406
)
[ARM] S3C: Merge next-s3c64xx-dma2 into for-rmk-devel
author
Ben Dooks
<ben-linux@fluff.org>
Mon, 18 May 2009 15:32:29 +0000
(16:32 +0100)
committer
Ben Dooks
<ben-linux@fluff.org>
Mon, 18 May 2009 15:32:29 +0000
(16:32 +0100)
Merge branch 'next-s3c64xx-dma2' into for-rmk-devel
Conflicts:
arch/arm/plat-s3c64xx/Makefile
Trivial merge