From: Colin Cross <ccross@android.com>
Date: Sat, 15 Jan 2011 01:32:17 +0000 (-0800)
Subject: Merge branch 'android-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~59
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=61327f2aa0b265952ee8834c920cbbf80cace95e;p=firefly-linux-kernel-4.4.55.git

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

61327f2aa0b265952ee8834c920cbbf80cace95e