Merge branch 'hwmod_dss_fixes_3.2rc' of git://git.pwsan.com/linux-2.6 into fixes
authorTony Lindgren <tony@atomide.com>
Sat, 19 Nov 2011 00:01:23 +0000 (16:01 -0800)
committerTony Lindgren <tony@atomide.com>
Sat, 19 Nov 2011 00:01:23 +0000 (16:01 -0800)

Trivial merge