Merge branch 'for-l-o-3.5' of git://gitorious.org/linux-omap-dss2/linux into cleanup-dss
authorTony Lindgren <tony@atomide.com>
Wed, 9 May 2012 15:39:20 +0000 (08:39 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 9 May 2012 15:39:20 +0000 (08:39 -0700)

Trivial merge