From: Colin Cross <ccross@android.com>
Date: Sat, 18 Dec 2010 01:23:38 +0000 (-0800)
Subject: Merge branch 'android-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~82
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8ab30a059d66645d6ddf69f18a7342d761f3c0b9;p=firefly-linux-kernel-4.4.55.git

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

8ab30a059d66645d6ddf69f18a7342d761f3c0b9