From: Colin Cross <ccross@android.com>
Date: Fri, 5 Nov 2010 01:18:03 +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~369
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8d8b4f93c6b1cb427cf944290ed4d7ef15235a6b;p=firefly-linux-kernel-4.4.55.git

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

8d8b4f93c6b1cb427cf944290ed4d7ef15235a6b