Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
authorIliyan Malchev <malchev@google.com>
Tue, 23 Nov 2010 00:07:44 +0000 (16:07 -0800)
committerIliyan Malchev <malchev@google.com>
Tue, 23 Nov 2010 00:07:44 +0000 (16:07 -0800)
commitb4d50aa63c58b8affa08f60f4dba415040845371
tree86a34d962893ce160d22ea24904c9b1849dd3c93
parentb7b7ed87ac9d4b1bb8a35a2b02f1d0effb668c76
parent3707e1c4af5f9af1a45c27a5894ac23741c05d80
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36

Conflicts:
arch/arm/mach-tegra/tegra_i2s_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