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