From: Colin Cross <ccross@android.com>
Date: Wed, 20 Oct 2010 21:44:20 +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~426
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=aa40263c6a5f55c554734ff9c1463944421c3f7e;p=firefly-linux-kernel-4.4.55.git

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

aa40263c6a5f55c554734ff9c1463944421c3f7e