Skip to content
Commit 9a2ee715 authored by Sascha Hauer's avatar Sascha Hauer
Browse files

Merge branch 'cleanups/assorted' into imx-fixes-for-arnd 



Conflicts:
	arch/arm/mach-imx/mm-imx3.c

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parents 13420c6b ca06679d
Hide whitespace changes
Inline Side-by-side
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