From: Erik Gilling <konkers@android.com>
Date: Wed, 15 Dec 2010 02:10:08 +0000 (-0800)
Subject: Merge remote branch android-2.6.36 into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~85
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8afb3d34090820f4128e6e2182a7231423c47b28;p=firefly-linux-kernel-4.4.55.git

Merge remote branch android-2.6.36 into android-tegra-2.6.36

Change-Id: Ice30bc601132f829abd664c68ddc61cbcdb8668c
---

8afb3d34090820f4128e6e2182a7231423c47b28