Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Fri, 21 Jan 2011 08:33:25 +0000 (00:33 -0800)
committerColin Cross <ccross@android.com>
Fri, 21 Jan 2011 08:33:25 +0000 (00:33 -0800)
1  2 
arch/arm/mach-tegra/tegra2_clocks.c

Simple merge