git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f1992dd 36be505)
Merge tag 'v3.4-rc7' into for-3.5
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 13 May 2012 12:32:54 +0000 (13:32 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 13 May 2012 12:32:54 +0000 (13:32 +0100)
Linux 3.4-rc7

Conflicts):
drivers/base/regmap/regmap.c         (overlap with bug fixes)
sound/soc/blackfin/bf5xx-ssm2602.c   (overlap with bug fixes)


Trivial merge
Pandora Kernel Repository