git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3d4db84
1a71e4a
)
ARM: Merge next-s3c24xx-dev-rtp
author
Ben Dooks
<ben-linux@fluff.org>
Thu, 3 Dec 2009 21:33:01 +0000
(21:33 +0000)
committer
Ben Dooks
<ben-linux@fluff.org>
Thu, 3 Dec 2009 21:33:01 +0000
(21:33 +0000)
Merge branch 'next-s3c24xx-dev-rtp' into for-rmk
Conflicts:
arch/arm/mach-s3c2440/mach-anubis.c
Trivial merge