From: Colin Cross <ccross@android.com>
Date: Thu, 25 Nov 2010 00:41:53 +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~313
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=59846879cc5b54609f7df3eec53d915d36cf8097;p=firefly-linux-kernel-4.4.55.git

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

59846879cc5b54609f7df3eec53d915d36cf8097