Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Wed, 12 Jan 2011 00:43:37 +0000 (16:43 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Wed, 12 Jan 2011 00:43:37 +0000 (16:43 -0800)
1  2 
arch/arm/mach-tegra/tegra2_clocks.c

Simple merge