git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
15db3e8
142f210
)
Merge branch 'samsung/driver' into next/drivers
author
Arnd Bergmann
<arnd@arndb.de>
Mon, 9 Jan 2012 16:16:29 +0000
(16:16 +0000)
committer
Arnd Bergmann
<arnd@arndb.de>
Mon, 9 Jan 2012 16:16:29 +0000
(16:16 +0000)
Conflicts:
arch/arm/mach-mxs/include/mach/common.h
Pull in previous samsung conflict merges and do a trivial
merge of an mxs double-add conflict.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff