Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Fri, 15 Oct 2010 00:19:09 +0000 (17:19 -0700)
committerColin Cross <ccross@android.com>
Fri, 15 Oct 2010 00:19:09 +0000 (17:19 -0700)
commitbedd07edd38448968f8d4dc59b24f2bdfb52a530
treebf391bee8b559e256b19c4be7f58096e0a2740c3
parent77105edfe2a344c81fca23a23226eb3b4db8b7b2
parentc8b43bb8ec47fc7e75f4474b454d459a22d9f233
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
arch/arm/mach-tegra/tegra_i2s_audio.c