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

Conflicts:
drivers/spi/spi-omap2-mcspi.c


Trivial merge
Pandora Kernel Repository