git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fad1070
2ce420d
)
Merge remote-tracking branch 'grant/gpio/next-mx' into devel-features
author
Sascha Hauer
<s.hauer@pengutronix.de>
Thu, 7 Jul 2011 08:00:49 +0000
(10:00 +0200)
committer
Sascha Hauer
<s.hauer@pengutronix.de>
Thu, 7 Jul 2011 08:00:49 +0000
(10:00 +0200)
Conflicts:
arch/arm/mach-imx/mach-mx31_3ds.c
arch/arm/mach-imx/mach-scb9328.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff