Merge branch 'hwmod_data_fixes_3.2rc' of git://git.pwsan.com/linux-2.6 into fixes...
authorTony Lindgren <tony@atomide.com>
Fri, 16 Dec 2011 19:29:21 +0000 (11:29 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 16 Dec 2011 19:29:21 +0000 (11:29 -0800)

Trivial merge