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

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

c37bff78783d40d6e604129135c207e279de902f