From: John Stultz Date: Wed, 18 Jun 2014 16:32:43 +0000 (-0700) Subject: Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10 X-Git-Tag: firefly_0821_release~3680^2~4^2~15^2~8 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=0b3d5ff454df314e41cc863e4d08d89aedb74aeb;p=firefly-linux-kernel-4.4.55.git Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10 --- 0b3d5ff454df314e41cc863e4d08d89aedb74aeb