Merge branch 'topic/suspend' of...

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

Conflicts:
	drivers/regulator/sky81452-regulator.c