Skip to content
Commit 6da5ce17 authored by Sascha Hauer's avatar Sascha Hauer
Browse files

Merge branches 'cleanups/assorted' and 'cleanups/mm-tzic' into imx-cleanup 



Conflicts:
	arch/arm/mach-mx5/Makefile

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parents 04871e93 a35b9147 4c542390
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment