Merge branch 'linaro-fixes/android-3.10' into linaro-android-3.10-lsk
authorAmit Pundir <amit.pundir@linaro.org>
Mon, 18 Aug 2014 06:33:20 +0000 (12:03 +0530)
committerAmit Pundir <amit.pundir@linaro.org>
Mon, 18 Aug 2014 06:33:20 +0000 (12:03 +0530)

Trivial merge