From: Erik Gilling <konkers@android.com>
Date: Tue, 19 Apr 2011 20:38:51 +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~9
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=676fc7826018c7a32576c168028208c88d731e1f;p=firefly-linux-kernel-4.4.55.git

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

Change-Id: I16e5fe9a9976a33ae102187988a240aa5f8a766b
---

676fc7826018c7a32576c168028208c88d731e1f