Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10
authorJohn Stultz <john.stultz@linaro.org>
Fri, 9 May 2014 22:16:40 +0000 (15:16 -0700)
committerJohn Stultz <john.stultz@linaro.org>
Fri, 9 May 2014 22:16:40 +0000 (15:16 -0700)
commit53a9dbb18edceca5fe3f824d90bd5bf94f136509
tree566e347a44dd9d747e8197db4db538242042de11
parentc98e2fbb7e3d997a677cc117f70dfae6f19a802f
parent1b48727337de9e12237583931315cc6d85532415
Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10
drivers/staging/android/Kconfig