Merge tag 'v3.11-rc5' into spi-s3c64xx
authorMark Brown <broonie@linaro.org>
Wed, 14 Aug 2013 10:22:09 +0000 (11:22 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 14 Aug 2013 10:22:09 +0000 (11:22 +0100)
Linux 3.11-rc5


Trivial merge