git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7126936
bcedfa9
)
ARM: Merge next-samsung-mc-adc
author
Ben Dooks
<ben-linux@fluff.org>
Tue, 19 Jan 2010 08:42:02 +0000
(17:42 +0900)
committer
Ben Dooks
<ben-linux@fluff.org>
Tue, 19 Jan 2010 08:42:02 +0000
(17:42 +0900)
Merge branch 'next-samsung-mc-adc' into next-samsung-try5
Conflicts:
arch/arm/mach-s3c6400/include/mach/map.h
(fix ADC and RTC merge)
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff