Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Fri, 8 Oct 2010 00:37:06 +0000 (17:37 -0700)
committerColin Cross <ccross@android.com>
Fri, 8 Oct 2010 00:37:06 +0000 (17:37 -0700)
commit1f1f73839877eba40a00ec200c89d3089b3ce13e
tree6d26f4233acfc3e3b913b16852d2c956bbfee0f2
parent6e8e9a4c49306aff672d24a87f9fc217ec71c054
parentecf1cce25ccc5bf6326ae00cf0675a4ff9a9ff2d
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36

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

Change-Id: Id7a483e1377549529f85a8fea67b76a881e40f87