git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3b3c281
f55be1b
)
Merge branch 'depends/rmk/gpio' into next/board
author
Arnd Bergmann
<arnd@arndb.de>
Fri, 21 Oct 2011 14:46:26 +0000
(16:46 +0200)
committer
Arnd Bergmann
<arnd@arndb.de>
Fri, 21 Oct 2011 14:46:26 +0000
(16:46 +0200)
Conflicts:
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-at91/board-usb-a9263.c
arch/arm/mach-tegra/board-paz00.h
arch/arm/mach-tegra/board-seaboard.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff