Merge branch 'hwmod_misc_devel_3.4' of git://git.pwsan.com/linux-2.6 into hwmod
authorTony Lindgren <tony@atomide.com>
Fri, 9 Mar 2012 20:06:15 +0000 (12:06 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 9 Mar 2012 20:06:15 +0000 (12:06 -0800)

Trivial merge