From: Colin Cross Date: Thu, 21 Oct 2010 21:52:07 +0000 (-0700) Subject: Merge branch 'android-2.6.36' into android-tegra-2.6.36 X-Git-Tag: firefly_0821_release~9833^2~144 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e837dc17608f46e6ffb72393fa84601eda6c3e4f;p=firefly-linux-kernel-4.4.55.git Merge branch 'android-2.6.36' into android-tegra-2.6.36 --- e837dc17608f46e6ffb72393fa84601eda6c3e4f