git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 178e43a 411a2df)
Merge remote-tracking branch 'regulator/topic/drivers' into regulator-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 12 May 2012 10:10:25 +0000 (11:10 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 12 May 2012 10:10:25 +0000 (11:10 +0100)
Conflicts:
drivers/regulator/88pm8607.c (simple overlap with a bugfix in v3.4)


Trivial merge
Pandora Kernel Repository