Merge tag 'v3.13-rc6' into spi-rcar
authorMark Brown <broonie@linaro.org>
Mon, 30 Dec 2013 13:45:00 +0000 (13:45 +0000)
committerMark Brown <broonie@linaro.org>
Mon, 30 Dec 2013 13:45:00 +0000 (13:45 +0000)
commit68e67d97e1f91ed11e041b67f3a1336f518c608f
tree1de288bc05f1cf1bfec20200a60ffe99dcce77ae
parent9e03d05eee4ca45ed12749ef6c26bf616262cdd2
parent802eee95bde72fd0cd0f3a5b2098375a487d1eda
Merge tag 'v3.13-rc6' into spi-rcar

To resolve spurious merge conflicts with fixes.

Linux 3.13-rc6