git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c72dbae
8b61f37
)
Merge branch 'highbank/soc' into next/soc
author
Arnd Bergmann
<arnd@arndb.de>
Wed, 2 Nov 2011 01:46:10 +0000
(
02:46
+0100)
committer
Arnd Bergmann
<arnd@arndb.de>
Wed, 2 Nov 2011 01:46:10 +0000
(
02:46
+0100)
Conflicts:
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-omap2/board-generic.c
arch/arm/plat-mxc/include/mach/gpio.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff