From: Colin Cross <ccross@android.com>
Date: Wed, 13 Oct 2010 01:33:34 +0000 (-0700)
Subject: Merge branch 'android-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~162
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b3905a5de44c005194a847810c1228b9e5471c7c;p=firefly-linux-kernel-4.4.55.git

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

b3905a5de44c005194a847810c1228b9e5471c7c