From: Colin Cross <ccross@android.com>
Date: Thu, 4 Nov 2010 19:18:22 +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~371
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=045b41e4f452a19f79b91b9d12153d5898381923;p=firefly-linux-kernel-4.4.55.git

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

045b41e4f452a19f79b91b9d12153d5898381923