Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Wed, 24 Nov 2010 05:40:20 +0000 (21:40 -0800)
committerColin Cross <ccross@android.com>
Wed, 24 Nov 2010 05:40:20 +0000 (21:40 -0800)
commite7d1629efd49f695fc0691317f0f7696670fcac3
tree534feeea0e61dc6f10c3bf08dd7751765fb051f4
parentdb00ce6fd30bef7808a2e8be6d72632325e66d50
parent1c4ea2e1b44c2763517e19f2e745a77a971af322
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/include/mach/iomap.h