git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
91fed55
f55be1b
)
Merge branch 'depends/rmk/gpio' into next/fixes
author
Arnd Bergmann
<arnd@arndb.de>
Mon, 31 Oct 2011 21:44:18 +0000
(22:44 +0100)
committer
Arnd Bergmann
<arnd@arndb.de>
Mon, 31 Oct 2011 21:44:18 +0000
(22:44 +0100)
This sorts out merge conflicts with the arm/gpio branch that
already got merged into mainline Linux.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff