git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6307e41
b1f91a9
)
Merge branch 'imx/defconfig' into next/drivers
author
Arnd Bergmann
<arnd@arndb.de>
Tue, 20 Mar 2012 22:40:37 +0000
(22:40 +0000)
committer
Arnd Bergmann
<arnd@arndb.de>
Tue, 20 Mar 2012 22:40:37 +0000
(22:40 +0000)
Conflicts:
arch/arm/configs/imx_v6_v7_defconfig
Resolves one conflict with an earlier branch
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff