From: Erik Gilling <konkers@android.com>
Date: Wed, 27 Oct 2010 04:08:37 +0000 (-0700)
Subject: Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~139
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cad4b96fa6dc283698b5a9c2aaf8ccdf7d43861a;p=firefly-linux-kernel-4.4.55.git

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

Change-Id: Ifde4541e78b49ef83ed11d3a488c6580cf89af15
---

cad4b96fa6dc283698b5a9c2aaf8ccdf7d43861a