From: Colin Cross <ccross@android.com>
Date: Sat, 22 Jan 2011 03:10:39 +0000 (-0800)
Subject: Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~54
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ae80836c409a6986c1415e19472503f16670bae5;p=firefly-linux-kernel-4.4.55.git

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

ae80836c409a6986c1415e19472503f16670bae5