From: Tony Lindgren <tony@atomide.com>
Date: Wed, 23 Feb 2011 20:06:28 +0000 (-0800)
Subject: Merge branch 'for-tony' of git://gitorious.org/linux-omap-dss2/linux into omap-for... 
X-Git-Tag: firefly_0821_release~7613^2~1763^2~27
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7cab8713b1ed0dab08ad6458f92a40b7ff4be619;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-tony' of git://gitorious.org/linux-omap-dss2/linux into omap-for-linus

Conflicts:
	arch/arm/mach-omap2/board-3430sdp.c
---

7cab8713b1ed0dab08ad6458f92a40b7ff4be619