Merge branch 'hwmod_data_devel_3.3' of git://git.pwsan.com/linux-2.6 into hwmod
authorTony Lindgren <tony@atomide.com>
Sat, 17 Dec 2011 00:10:22 +0000 (16:10 -0800)
committerTony Lindgren <tony@atomide.com>
Sat, 17 Dec 2011 00:10:22 +0000 (16:10 -0800)

Trivial merge