git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1075329
f55be1b
)
Merge branch 'depends/rmk/gpio' into next/devel
author
Arnd Bergmann
<arnd@arndb.de>
Mon, 31 Oct 2011 22:46:42 +0000
(23:46 +0100)
committer
Arnd Bergmann
<arnd@arndb.de>
Mon, 31 Oct 2011 22:46:42 +0000
(23:46 +0100)
Conflicts:
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/plat-mxc/include/mach/gpio.h
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff