From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 28 Nov 2012 19:24:48 +0000 (+0000)
Subject: Merge branch 'topic/tps51632' 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~13^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d6e6ffc400dbc3ea0cc58b8b6f9d9ac748d6572;p=pandora-kernel.git

Merge branch 'topic/tps51632' of git://git./linux/kernel/git/broonie/regulator into regulator-min

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

5d6e6ffc400dbc3ea0cc58b8b6f9d9ac748d6572
Reading git-diff-tree failed