git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
05a690d
adc0950
)
ARM: Merge for-2635/samsung-rtc
author
Ben Dooks
<ben-linux@fluff.org>
Wed, 19 May 2010 09:07:25 +0000
(18:07 +0900)
committer
Ben Dooks
<ben-linux@fluff.org>
Wed, 19 May 2010 09:07:25 +0000
(18:07 +0900)
Merge branch 'for-2635/samsung-rtc' into for-linus/samsung2
Conflicts:
arch/arm/mach-s3c64xx/include/mach/map.h
arch/arm/plat-samsung/Kconfig
arch/arm/plat-samsung/Makefile
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff