From: Colin Cross <ccross@android.com>
Date: Fri, 7 Jan 2011 02:12:22 +0000 (-0800)
Subject: Merge branch 'android-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~75
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3051b1526aca9dc9262028a5dd443d1083364b95;p=firefly-linux-kernel-4.4.55.git

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

3051b1526aca9dc9262028a5dd443d1083364b95