From: John Stultz Date: Mon, 14 Apr 2014 19:00:59 +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~11 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c98e2fbb7e3d997a677cc117f70dfae6f19a802f;p=firefly-linux-kernel-4.4.55.git Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10 --- c98e2fbb7e3d997a677cc117f70dfae6f19a802f