Merge branch 'upstream/android-3.10' into 'linaro-fixes/android-3.10'
authorAmit Pundir <amit.pundir@linaro.org>
Mon, 1 Sep 2014 11:24:38 +0000 (16:54 +0530)
committerAmit Pundir <amit.pundir@linaro.org>
Mon, 1 Sep 2014 11:24:38 +0000 (16:54 +0530)
1  2 
arch/arm/Kconfig

Simple merge