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

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

02039465df5885728846005d3d7cb9742222c926