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

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

e6e83971d48c98393a15b48b5a66a4c2f55753fe