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

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

f80c849e73f023912a19ed0e9c3336561efad717