From: Colin Cross <ccross@android.com>
Date: Fri, 4 Mar 2011 02:55:38 +0000 (-0800)
Subject: Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~25
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=07a84a1ce6dae0bd521ac30c56ffc22f31da10b1;p=firefly-linux-kernel-4.4.55.git

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

07a84a1ce6dae0bd521ac30c56ffc22f31da10b1