git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 77b71b3 8dc995f)
Merge branch 'topic/hotplug' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 27 Nov 2012 20:06:08 +0000 (20:06 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 27 Nov 2012 20:06:08 +0000 (20:06 +0000)
Conflicts:
drivers/regulator/max8997.c


Trivial merge
Pandora Kernel Repository