git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f141822 6887a41)
Merge tag 'v3.5-rc5' into regulator-drivers
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 2 Jul 2012 17:24:59 +0000 (18:24 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 2 Jul 2012 17:24:59 +0000 (18:24 +0100)
Linux 3.5-rc5 collides with further development.

Conflicts:
drivers/regulator/tps65023-regulator.c


Trivial merge
Pandora Kernel Repository