Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Fri, 21 Nov 2014 16:52:29 +0000 (16:52 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 21 Nov 2014 16:52:29 +0000 (16:52 +0000)

Trivial merge