From: Colin Cross <ccross@android.com>
Date: Thu, 30 Dec 2010 00:15:17 +0000 (-0800)
Subject: Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~77
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4d86495ef99f6a8de7154794eeb765001658e44c;p=firefly-linux-kernel-4.4.55.git

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

4d86495ef99f6a8de7154794eeb765001658e44c