Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
authorIliyan Malchev <malchev@google.com>
Tue, 23 Nov 2010 21:58:43 +0000 (13:58 -0800)
committerIliyan Malchev <malchev@google.com>
Tue, 23 Nov 2010 21:58:43 +0000 (13:58 -0800)
commit110d84390df5c844d54f761273e302d0da72494c
tree87c46a4af6fd8f3f243b52a39a5f828f7ddd78ad
parentb4d50aa63c58b8affa08f60f4dba415040845371
parente9ccef1e986bc57d7e49d8b8c6bb813c8651c6b5
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36

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

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