Merge tag 'v3.11-rc4' into spi-bitbang
authorMark Brown <broonie@linaro.org>
Fri, 9 Aug 2013 16:26:31 +0000 (17:26 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 9 Aug 2013 16:26:31 +0000 (17:26 +0100)
Linux 3.11-rc4


Trivial merge