git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a2f7bff
5b7d7b2
)
ARM: Merge for-2635-4/watchdog
author
Ben Dooks
<ben-linux@fluff.org>
Thu, 20 May 2010 10:51:40 +0000
(19:51 +0900)
committer
Ben Dooks
<ben-linux@fluff.org>
Thu, 20 May 2010 10:51:40 +0000
(19:51 +0900)
Merge branch 'for-2635-4/watchdog' into for-2635-4/partial2
Conflicts:
arch/arm/mach-s3c64xx/mach-smdk6410.c
arch/arm/mach-s5p6440/Kconfig
arch/arm/mach-s5p6440/include/mach/map.h
arch/arm/mach-s5p6440/mach-smdk6440.c
arch/arm/mach-s5pv210/Kconfig
arch/arm/mach-s5pv210/include/mach/map.h
arch/arm/mach-s5pv210/mach-smdkv210.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff