From: Erik Gilling <konkers@android.com>
Date: Mon, 24 Jan 2011 20:50:57 +0000 (-0800)
Subject: Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~52
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8fdd40eb453527ca6133d61463e3a97854be84e6;p=firefly-linux-kernel-4.4.55.git

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

Change-Id: I31c6619f888c36cfe571fda8593f6e1172810ba9
---

8fdd40eb453527ca6133d61463e3a97854be84e6