From: Mark Brown 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-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f291c74a32509d31731bb82cbb26c64cd430805b;p=linux-beck.git 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 --- f291c74a32509d31731bb82cbb26c64cd430805b