Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Fri, 3 Dec 2010 23:59:54 +0000 (15:59 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Fri, 3 Dec 2010 23:59:54 +0000 (15:59 -0800)
1  2 
arch/arm/mach-tegra/tegra_i2s_audio.c

Simple merge