From: Erik Gilling <konkers@android.com>
Date: Thu, 7 Apr 2011 21:37:03 +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~23
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=17286cfd88964880eddf6b570f2b0da500191a23;p=firefly-linux-kernel-4.4.55.git

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

Change-Id: I190487c0932d67872e1c29c0d2296f24a515851c
---

17286cfd88964880eddf6b570f2b0da500191a23