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)
commit4ed4afb836315bbfc12f1fec212c771f0835c93a
tree78385eef0daf0a9ff06bcacfc29d4e766fafb8e5
parentb03eb90cc3e3e1f6334939d9f0031bf54b3c9986
parent7682da908fc36d2c0edc63d269feafaa975ac82e
Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36

Change-Id: I27504990282eccc4dd6edd16768ae32ad3e4380c
arch/arm/mach-tegra/board-ventana.c
arch/arm/mach-tegra/tegra_i2s_audio.c