From: Colin Cross <ccross@android.com>
Date: Wed, 24 Nov 2010 05:39:33 +0000 (-0800)
Subject: Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~101
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1c4ea2e1b44c2763517e19f2e745a77a971af322;p=firefly-linux-kernel-4.4.55.git

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

1c4ea2e1b44c2763517e19f2e745a77a971af322