Skip to content
Commit 970a724d authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'omap3-upstream' into for-next 

Conflicts:
	arch/arm/mach-omap2/serial.c
parents c81592ba 4a899d5e
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