]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'fix/88pm800' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Fri, 17 Jul 2015 11:42:48 +0000 (12:42 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 17 Jul 2015 11:42:48 +0000 (12:42 +0100)
commit9758fb54bc788842c51998a8c44c90ca70fa7752
treed2f4a544d3b96f7e576a7622e3cd75cc2bcfa51d
parentafe2da5fc894d786f6bd35d69fbdce4bc31a8000
parent982c48cac6bdda7b11bde75834fe7159437f1259
Merge branch 'fix/88pm800' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-88pm800

Conflicts:
drivers/regulator/88pm800.c
drivers/regulator/88pm800.c