git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7e1efcf
b4cbb8a
)
Merge branch 'imx/devel' into next/dt
author
Arnd Bergmann
<arnd@arndb.de>
Tue, 1 Nov 2011 16:12:22 +0000
(17:12 +0100)
committer
Arnd Bergmann
<arnd@arndb.de>
Tue, 1 Nov 2011 16:12:22 +0000
(17:12 +0100)
The board changes in the imx/devel branch conflict with other changes in
the device imx/dt branch.
Conflicts:
arch/arm/mach-mx5/board-mx53_loco.c
arch/arm/mach-mx5/board-mx53_smd.c
arch/arm/plat-mxc/include/mach/common.h
arch/arm/plat-mxc/include/mach/memory.h
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff