From: Mark Brown <broonie@kernel.org>
Date: Fri, 5 Dec 2014 11:06:18 +0000 (+0000)
Subject: Merge branch 'topic/suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: omap-for-v3.19/fixes-for-merge-window~23^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f291c74a32509d31731bb82cbb26c64cd430805b;p=pandora-kernel.git

Merge branch 'topic/suspend' of git://git./linux/kernel/git/broonie/regulator into regulator-sky81452

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

f291c74a32509d31731bb82cbb26c64cd430805b