From: Colin Cross Date: Fri, 29 Oct 2010 00:53:24 +0000 (-0700) Subject: Merge branch 'android-2.6.36' into android-tegra-2.6.36 X-Git-Tag: firefly_0821_release~9833^2~138 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4dfda9f3b7a3986ab452b3e214a13805ed1acdd4;p=firefly-linux-kernel-4.4.55.git Merge branch 'android-2.6.36' into android-tegra-2.6.36 --- 4dfda9f3b7a3986ab452b3e214a13805ed1acdd4