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

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

b9ed9053e21edb8332a5f8e73ea9c35d57388542