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