git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a502357 64e4816)
Merge branch 'topic/tps6586x' of git://git.kernel.org/pub/scm/linux/kernel/git/brooni...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 20 Nov 2012 01:39:55 +0000 (10:39 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 20 Nov 2012 01:39:55 +0000 (10:39 +0900)
Conflicts:
drivers/regulator/tps6586x-regulator.c


Trivial merge
Pandora Kernel Repository