Merge tag 'v3.10.4' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Mon, 29 Jul 2013 11:54:31 +0000 (12:54 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 29 Jul 2013 11:54:31 +0000 (12:54 +0100)
This is the 3.10.4 stable release


Trivial merge