git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d35b7a8
110d85a
)
ARM: Merge next-samsung-s3c64xx-platdeletion
author
Ben Dooks
<ben-linux@fluff.org>
Mon, 22 Feb 2010 23:38:26 +0000
(23:38 +0000)
committer
Ben Dooks
<ben-linux@fluff.org>
Mon, 22 Feb 2010 23:38:26 +0000
(23:38 +0000)
Merge branch 'next-samsung-s3c64xx-platdeletion' into next-samsung
Conflicts:
arch/arm/mach-s3c64xx/Makefile (fixed)
Trivial merge