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)
commitdc00fd520bb1059e8a351599d4379ee5f1a0eca3
treeb607c0198b68bd7cffbfb7f792775135e133c98d
parent61ac344745d3ab8d143906fb774c529c9301e574
parente8d9abdf7b8878740e73a13ba084c39a24967da2
Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36

Change-Id: Id52bf11ad517d9ebf5b68db4db15c006b82d75f9
arch/arm/mach-tegra/tegra_i2s_audio.c
arch/arm/mach-tegra/tegra_spdif_audio.c