git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
155bc27
a07613a
)
Merge branch 'samsung/cleanup' into samsung/driver
author
Arnd Bergmann
<arnd@arndb.de>
Mon, 9 Jan 2012 16:14:07 +0000
(16:14 +0000)
committer
Arnd Bergmann
<arnd@arndb.de>
Mon, 9 Jan 2012 16:14:07 +0000
(16:14 +0000)
Conflicts:
arch/arm/mach-s5p64x0/cpu.c -> common.c
More changes to a file that got moved into common.c,
see previous conflict resolutions.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff