Merge branch 'hwmod_dss_fixes_3.2rc' of git://git.pwsan.com/linux-2.6 into fixes-dss
authorTony Lindgren <tony@atomide.com>
Wed, 23 Nov 2011 22:57:37 +0000 (14:57 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 23 Nov 2011 22:57:37 +0000 (14:57 -0800)

Trivial merge