From: Colin Cross <ccross@android.com>
Date: Fri, 15 Oct 2010 00:19:09 +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~452
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bedd07edd38448968f8d4dc59b24f2bdfb52a530;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: I9e2892c49d97c63de3a8e5797d6d9a123ae2d161
---

bedd07edd38448968f8d4dc59b24f2bdfb52a530