Merge branch 'for_3.4/pm/smps-regulator' of git://git.kernel.org/pub/scm/linux/kernel... omap-pm-regulator-for-v3.5
authorTony Lindgren <tony@atomide.com>
Mon, 30 Apr 2012 17:08:29 +0000 (10:08 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 30 Apr 2012 17:08:29 +0000 (10:08 -0700)
Conflicts:
arch/arm/mach-omap2/twl-common.c


Trivial merge