Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Wed, 12 Jan 2011 08:04:01 +0000 (00:04 -0800)
committerColin Cross <ccross@android.com>
Wed, 12 Jan 2011 08:04:01 +0000 (00:04 -0800)
commit33cd348d6791bdd4f2e7c4af30c9e7eefc22dd5a
treee9c5ed650ea55516a50b1d8d4fe956f257e19476
parent9aa134db42eed7a1fc894bbad37275a920cc6580
parenta8ac34d55b93be3f92efa0b02a2bdb8c156149d1
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
arch/arm/mach-tegra/tegra_i2s_audio.c