From: Colin Cross <ccross@android.com>
Date: Thu, 14 Oct 2010 23:22:55 +0000 (-0700)
Subject: Merge branch 'android-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~155
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5cb18262c713c8e2a007b81a4662cb2225b56211;p=firefly-linux-kernel-4.4.55.git

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

5cb18262c713c8e2a007b81a4662cb2225b56211