git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e64d07a 5698bd7)
Merge tag 'v3.6-rc6' into spi-mxs
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 25 Sep 2012 12:41:02 +0000 (13:41 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 25 Sep 2012 12:41:02 +0000 (13:41 +0100)
Linux 3.6-rc6

Conflicts (overlap between moving code that accesses registers around
and factoring the register access out into a SSP layer):
drivers/mmc/host/mxs-mmc.c


Trivial merge
Pandora Kernel Repository