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

Trivial merge