Merge branch 'hwmod_misc_devel_3.4' of git://git.pwsan.com/linux-2.6 into hwmod
authorTony Lindgren <tony@atomide.com>
Tue, 3 Apr 2012 16:47:23 +0000 (09:47 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 3 Apr 2012 16:47:23 +0000 (09:47 -0700)

Trivial merge