Merge branch 'hwmod_data_devel_3.3' of git://git.pwsan.com/linux-2.6 into ehci
authorTony Lindgren <tony@atomide.com>
Fri, 16 Dec 2011 19:33:29 +0000 (11:33 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 16 Dec 2011 19:33:29 +0000 (11:33 -0800)

Trivial merge