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)
Conflicts:
arch/arm/mach-tegra/tegra_i2s_audio.c

Change-Id: I9e2892c49d97c63de3a8e5797d6d9a123ae2d161

1  2 
arch/arm/mach-tegra/tegra_i2s_audio.c

Simple merge