Merge branch 'topic/suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Fri, 5 Dec 2014 11:06:18 +0000 (11:06 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 5 Dec 2014 11:06:18 +0000 (11:06 +0000)
commitf291c74a32509d31731bb82cbb26c64cd430805b
treec19a8a22880a48a4a4b6eb91ba1a30dd62427f5e
parent8b7daad3da2b36f5fe494f5d0c5ef25b33d56b96
parent5e5e3a42c653c5ef1c281651f1882411601129bd
Merge branch 'topic/suspend' of git://git./linux/kernel/git/broonie/regulator into regulator-sky81452

Conflicts:
drivers/regulator/sky81452-regulator.c