Skip to content
Snippets Groups Projects
Commit c72dbae9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'imx/devel' into next/dt 


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: default avatarArnd Bergmann <arnd@arndb.de>
parents 7e1efcf5 b4cbb8a4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 241 additions and 387 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment