]> 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)
commit9c19aeb7eef5505b2352f8ca23d45acdc4a3de3e
treec19a8a22880a48a4a4b6eb91ba1a30dd62427f5e
parent35772f71bd18123d7dee1e79b22f265352239917
parentb09b1d2deefbe2ca11502de93f8cbd494b92b1e5
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