From: Colin Cross <ccross@android.com>
Date: Mon, 22 Nov 2010 21:23:52 +0000 (-0800)
Subject: Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
X-Git-Tag: firefly_0821_release~9834^2~323
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ddd054141c9239bc428f02ee4a716ff4cb362b70;p=firefly-linux-kernel-4.4.55.git

Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
---

ddd054141c9239bc428f02ee4a716ff4cb362b70