From: Colin Cross <ccross@android.com>
Date: Mon, 18 Oct 2010 23:20:49 +0000 (-0700)
Subject: Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
X-Git-Tag: firefly_0821_release~9834^2~443
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8dd5db254f457c993dcf4e16ac90c1ed0209dce6;p=firefly-linux-kernel-4.4.55.git

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

8dd5db254f457c993dcf4e16ac90c1ed0209dce6