git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d6d649 5698bd7)
Merge tag 'v3.6-rc6' into for-3.7
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 22 Sep 2012 15:26:27 +0000 (11:26 -0400)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 22 Sep 2012 15:26:27 +0000 (11:26 -0400)
Linux 3.6-rc6 has all our bug fixes.

Conflicts (trivial overlap):
sound/soc/omap/am3517evm.c


Trivial merge
Pandora Kernel Repository