Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
authorErik Gilling <konkers@android.com>
Wed, 1 Dec 2010 21:45:02 +0000 (13:45 -0800)
committerErik Gilling <konkers@android.com>
Wed, 1 Dec 2010 21:45:38 +0000 (13:45 -0800)
Change-Id: I27504990282eccc4dd6edd16768ae32ad3e4380c

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

Simple merge
Simple merge