From: Tony Lindgren <tony@atomide.com>
Date: Mon, 30 Apr 2012 17:08:29 +0000 (-0700)
Subject: Merge branch 'for_3.4/pm/smps-regulator' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: omap-pm-regulator-for-v3.5^0
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8822e2d570bc265c9fa0347710fbcc7bef8b327;p=pandora-kernel.git

Merge branch 'for_3.4/pm/smps-regulator' of git://git./linux/kernel/git/khilman/linux-omap-pm into pm-regulator

Conflicts:
	arch/arm/mach-omap2/twl-common.c
---

a8822e2d570bc265c9fa0347710fbcc7bef8b327
Reading git-diff-tree failed