From: Colin Cross <ccross@android.com>
Date: Wed, 2 Mar 2011 01:27:10 +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~83
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=11267bd7f0943663175ff9edef679a4099a06759;p=firefly-linux-kernel-4.4.55.git

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

11267bd7f0943663175ff9edef679a4099a06759