Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Sat, 22 Nov 2014 11:07:41 +0000 (11:07 +0000)
committerMark Brown <broonie@kernel.org>
Sat, 22 Nov 2014 11:07:41 +0000 (11:07 +0000)

Trivial merge