From: Colin Cross <ccross@android.com>
Date: Sat, 8 Jan 2011 01:21:20 +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~199
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=07e419d412727b276236c9e3f69a2126945b6b30;p=firefly-linux-kernel-4.4.55.git

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

07e419d412727b276236c9e3f69a2126945b6b30