From: Colin Cross <ccross@android.com>
Date: Tue, 22 Mar 2011 18:42:14 +0000 (-0700)
Subject: Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~20
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9b571241de8cfa131178e9120ad46f1756bad8a7;p=firefly-linux-kernel-4.4.55.git

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

9b571241de8cfa131178e9120ad46f1756bad8a7