From: Colin Cross Date: Thu, 13 Jan 2011 04:21:22 +0000 (-0800) Subject: Merge branch 'android-2.6.36' into android-tegra-2.6.36 X-Git-Tag: firefly_0821_release~9833^2~60 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=da7187758bea309525069c6110d80520cb6635ab;p=firefly-linux-kernel-4.4.55.git Merge branch 'android-2.6.36' into android-tegra-2.6.36 --- da7187758bea309525069c6110d80520cb6635ab