From: Colin Cross <ccross@android.com>
Date: Thu, 13 Jan 2011 04:21:55 +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~172
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cb9e11f154594224f70d9b21c05ccaabad23f47c;p=firefly-linux-kernel-4.4.55.git

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

cb9e11f154594224f70d9b21c05ccaabad23f47c