Merge branch 'linux-tegra' into android-tegra
authorErik Gilling <konkers@android.com>
Mon, 18 Oct 2010 19:12:20 +0000 (12:12 -0700)
committerErik Gilling <konkers@android.com>
Mon, 18 Oct 2010 19:12:20 +0000 (12:12 -0700)
commit5b3a1cd90c79a9726ae1c45888088c73d629fb11
treeba4c52b8d649f4aff78efd3f3d8bf51326a98058
parent9ab3d8b9fcc83cb2eab5cc9834b742d437915a2e
parent943300a8d57ff28780d45401dc50fbc0792921a8
Merge branch 'linux-tegra' into android-tegra
arch/arm/mach-tegra/tegra_i2s_audio.c