From: Mark Brown <broonie@kernel.org>
Date: Fri, 9 Jan 2015 18:03:55 +0000 (+0000)
Subject: Merge branch 'topic/core' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: fixes-v4.0-rc1~183^2~4^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09d3f6f1613f287b1d3ea7d2c9caf5b7aff70c99;p=pandora-kernel.git

Merge branch 'topic/core' of git://git./linux/kernel/git/broonie/regulator into regulator-dt-cb

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

09d3f6f1613f287b1d3ea7d2c9caf5b7aff70c99
Reading git-diff-tree failed