Merge branch 'for_3.4/pm/smps-regulator' of git://git.kernel.org/pub/scm/linux/kernel...
authorTony Lindgren <tony@atomide.com>
Tue, 3 Apr 2012 16:33:51 +0000 (09:33 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 3 Apr 2012 16:33:51 +0000 (09:33 -0700)

Trivial merge