From: Colin Cross Date: Thu, 4 Nov 2010 19:18:08 +0000 (-0700) Subject: Merge branch 'android-2.6.36' into android-tegra-2.6.36 X-Git-Tag: firefly_0821_release~9833^2~124 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3bd5b681a00bd2640c0ddb18e060519abac0d37c;p=firefly-linux-kernel-4.4.55.git Merge branch 'android-2.6.36' into android-tegra-2.6.36 --- 3bd5b681a00bd2640c0ddb18e060519abac0d37c