From: John Stultz Date: Thu, 30 Jan 2014 19:09:50 +0000 (-0800) Subject: Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10 X-Git-Tag: firefly_0821_release~3680^2~4^2~33^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0c5c18ce48549cadd2021d133a6c0c8534617382;p=firefly-linux-kernel-4.4.55.git Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10 --- 0c5c18ce48549cadd2021d133a6c0c8534617382