From: Colin Cross Date: Mon, 22 Nov 2010 21:23:31 +0000 (-0800) Subject: Merge branch 'android-2.6.36' into android-tegra-2.6.36 X-Git-Tag: firefly_0821_release~9833^2~105 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1f2e04a35d3568d1b31ddeee41fd5549f16f471e;p=firefly-linux-kernel-4.4.55.git Merge branch 'android-2.6.36' into android-tegra-2.6.36 --- 1f2e04a35d3568d1b31ddeee41fd5549f16f471e