From: Colin Cross Date: Wed, 2 Feb 2011 18:03:34 +0000 (-0800) Subject: Merge branch 'android-2.6.36' into android-tegra-2.6.36 X-Git-Tag: firefly_0821_release~9833^2~45 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c8dd518b20b05eb07fe2ab024616e986a85ad5dd;p=firefly-linux-kernel-4.4.55.git Merge branch 'android-2.6.36' into android-tegra-2.6.36 --- c8dd518b20b05eb07fe2ab024616e986a85ad5dd