Skip to content
Commit 0ba86d7e authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

Merge commit 'v3.3-rc6' 

Merge v3.3-rc6 to get the latest DSS and OMAP arch fixes.

Conflicts:
	arch/arm/mach-omap1/board-innovator.c
	drivers/video/omap2/dss/apply.c
parents 973b659c 192cfd58
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment