From: Erik Gilling <konkers@android.com>
Date: Sat, 30 Oct 2010 01:16:19 +0000 (-0700)
Subject: Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
X-Git-Tag: firefly_0821_release~9834^2~394
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1aebc554cac3cbec091ff37eb84328906310da0f;p=firefly-linux-kernel-4.4.55.git

Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36

Change-Id: I6da740f6846d5212ff331bf4473a1e7faa96e21e
---

1aebc554cac3cbec091ff37eb84328906310da0f