]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitbb6499080ca8899c06a41d4a2493ae1130b49617
treec19a8a22880a48a4a4b6eb91ba1a30dd62427f5e
parent500d0c8caa5f9fa8785c70ef6e4d3ee6b40af708
parent5c2baeb39a1cc3b2caec84d4ab991af62c45c9d1
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