Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
authorErik Gilling <konkers@android.com>
Wed, 3 Nov 2010 20:52:36 +0000 (13:52 -0700)
committerErik Gilling <konkers@android.com>
Wed, 3 Nov 2010 20:52:58 +0000 (13:52 -0700)
Change-Id: Id52bf11ad517d9ebf5b68db4db15c006b82d75f9

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

Simple merge