git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd0ec7c 9997f3f)
Merge branch 'topic/tps51632' of git://git.kernel.org/pub/scm/linux/kernel/git/brooni...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 28 Nov 2012 19:24:48 +0000 (19:24 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 28 Nov 2012 19:24:48 +0000 (19:24 +0000)
Conflicts:
drivers/regulator/tps51632-regulator.c


Trivial merge
Pandora Kernel Repository