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

Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36

Change-Id: I27504990282eccc4dd6edd16768ae32ad3e4380c
---

4ed4afb836315bbfc12f1fec212c771f0835c93a