Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
authorIliyan Malchev <malchev@google.com>
Fri, 5 Nov 2010 20:41:17 +0000 (13:41 -0700)
committerIliyan Malchev <malchev@google.com>
Fri, 5 Nov 2010 21:01:35 +0000 (14:01 -0700)
commite143639c53cd1274f8f5f4f461b01d3c6e21ba20
treea9d6e3f0d4c14b71d0fd363bd87fbca69b7bfbe0
parent8bbec94947151d91b46d2b8895f4766302812394
parent86d007b0f88e0bcc859923cb3d13dc310d5bf057
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36

Conflicts:
arch/arm/mach-tegra/tegra_i2s_audio.c
arch/arm/mach-tegra/tegra_spdif_audio.c

Signed-off-by: Iliyan Malchev <malchev@google.com>
arch/arm/mach-tegra/tegra_i2s_audio.c
arch/arm/mach-tegra/tegra_spdif_audio.c