Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10
authorJohn Stultz <john.stultz@linaro.org>
Tue, 12 Nov 2013 22:18:51 +0000 (14:18 -0800)
committerJohn Stultz <john.stultz@linaro.org>
Tue, 12 Nov 2013 22:18:51 +0000 (14:18 -0800)
commit305a41042d6127e9596f66382bf4e81a70e24bb3
tree37c3959276e64d8044be13cf43f2abcec9ce1b70
parentb38c6f06915c69424abb85fbd5c16e418865ed9b
parent4244575c2f5d35c56b88d3d5bd34558c111e8667
Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10
arch/arm/boot/Makefile
drivers/staging/android/ion/ion_chunk_heap.c