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

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

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

b87d07b13c779c42e4929e590003c9eb8c2f06fa
Reading git-diff-tree failed