Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Wed, 13 Oct 2010 01:50:31 +0000 (18:50 -0700)
committerColin Cross <ccross@android.com>
Wed, 13 Oct 2010 01:50:31 +0000 (18:50 -0700)
commitc53cf3c0727c82aeacf4d08fca40a94b7557c811
treeec5509cce15a5d5d8e82505722dcb1aba94cd5a0
parentf922d75a29624dc250a74d90f8c8e9e7c1f8988d
parent3d533ce331337e58f16b25e5de9a57f1665c4a73
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36

Conflicts:
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/Makefile