From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Tue, 6 Mar 2012 11:20:31 +0000 (+0200)
Subject: Merge commit 'v3.3-rc6'
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0ba86d7edea1f9f2d9497c31200910263e8b4128;p=deliverable%2Flinux.git

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
---

0ba86d7edea1f9f2d9497c31200910263e8b4128