git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3245794
7d1a207
)
ARM: Merge for-2635/s5p-dma
author
Ben Dooks
<ben-linux@fluff.org>
Wed, 19 May 2010 09:05:15 +0000
(18:05 +0900)
committer
Ben Dooks
<ben-linux@fluff.org>
Wed, 19 May 2010 09:05:15 +0000
(18:05 +0900)
Merge branch 'for-2635/s5p-dma' into for-linus/samsung2
Conflicts:
arch/arm/mach-s5pv210/Makefile
Trivial merge