git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bcedfa9
7126936
)
ARM: Merge next-s3c64xx
author
Ben Dooks
<ben-linux@fluff.org>
Mon, 18 Jan 2010 00:35:29 +0000
(09:35 +0900)
committer
Ben Dooks
<ben-linux@fluff.org>
Mon, 18 Jan 2010 00:35:29 +0000
(09:35 +0900)
Merge branch 'next-s3c64xx' into next-samsung
Conflicts:
arch/arm/mach-s3c6400/include/mach/map.h
( ADC and RTC PA merge fixed)
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff