From: Colin Cross <ccross@android.com>
Date: Thu, 9 Dec 2010 03:54:28 +0000 (-0800)
Subject: Merge branch 'android-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~90
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2bc50e6e810abc002ccb32e46f36d20114d0b249;p=firefly-linux-kernel-4.4.55.git

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

2bc50e6e810abc002ccb32e46f36d20114d0b249