From: Colin Cross <ccross@android.com>
Date: Sat, 8 Jan 2011 22:48:26 +0000 (-0800)
Subject: Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
X-Git-Tag: firefly_0821_release~9834^2~194
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=334bd209f1f264742e4abfba8b0f2dc54d1d053a;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	drivers/misc/Kconfig
	drivers/misc/Makefile

Change-Id: Ic136562830dcd821eaae66f4c1fc66b4e0b825bd
---

334bd209f1f264742e4abfba8b0f2dc54d1d053a