From: Colin Cross <ccross@android.com>
Date: Fri, 21 Jan 2011 08:33:25 +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~145
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3c8f150219c83b2feabe89bcd16abf695b380914;p=firefly-linux-kernel-4.4.55.git

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

3c8f150219c83b2feabe89bcd16abf695b380914