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

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

04d8077a0330c97b08cd1747325f3428fa61be26