From: Colin Cross <ccross@android.com>
Date: Tue, 11 Jan 2011 01:18:52 +0000 (-0800)
Subject: Merge branch 'android-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~67
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=1fb62ec46a714b133d2b3297264a142154809e6e;p=firefly-linux-kernel-4.4.55.git

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

1fb62ec46a714b133d2b3297264a142154809e6e