From: Colin Cross <ccross@android.com>
Date: Tue, 2 Nov 2010 23:21:11 +0000 (-0700)
Subject: Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~131
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3e759e2c910e26e4a76f272e0411ebe1c88e4187;p=firefly-linux-kernel-4.4.55.git

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

3e759e2c910e26e4a76f272e0411ebe1c88e4187