From: Colin Cross <ccross@android.com>
Date: Fri, 8 Oct 2010 00:37:06 +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~470
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1f1f73839877eba40a00ec200c89d3089b3ce13e;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	arch/arm/mach-tegra/tegra_i2s_audio.c

Change-Id: Id7a483e1377549529f85a8fea67b76a881e40f87
---

1f1f73839877eba40a00ec200c89d3089b3ce13e