Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Wed, 20 Oct 2010 21:39:20 +0000 (14:39 -0700)
committerColin Cross <ccross@android.com>
Wed, 20 Oct 2010 21:39:20 +0000 (14:39 -0700)
commit4ab096ce9c6532f3876d1cbb71462f7a7101003b
treeceadc8a8f4f719d48c0ffe130df0c4df58a443e5
parentae9a66ccf4bfcac9b6085cf9d62955f2712f82db
parent0b313530b3fa263c5537a55703948a980f333388
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36

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

Change-Id: I3e05a70e3fb8fdaa8ca4c5ed78ca020c75ed0caa
arch/arm/mach-tegra/tegra_i2s_audio.c