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)
To resolve spurious merge conflicts with fixes.

Linux 3.13-rc6


Trivial merge