Merge branch 'android-3.10' of https://android.googlesource.com/kernel/common into...
authorMark Brown <broonie@linaro.org>
Fri, 13 Dec 2013 18:50:12 +0000 (18:50 +0000)
committerMark Brown <broonie@linaro.org>
Fri, 13 Dec 2013 18:50:12 +0000 (18:50 +0000)

Trivial merge