From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 20 Nov 2012 01:39:55 +0000 (+0900)
Subject: Merge branch 'topic/tps6586x' of git://git.kernel.org/pub/scm/linux/kernel/git/brooni... 
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~35^2~20^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce6dd5da9dfcf9232df09d8d486cd6ed25e29cdc;p=pandora-kernel.git

Merge branch 'topic/tps6586x' of git://git./linux/kernel/git/broonie/regulator into regulator-hotplug

Conflicts:
	drivers/regulator/tps6586x-regulator.c
---

ce6dd5da9dfcf9232df09d8d486cd6ed25e29cdc
Reading git-diff-tree failed