Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Tue, 11 Jan 2011 03:09:49 +0000 (19:09 -0800)
committerColin Cross <ccross@android.com>
Tue, 11 Jan 2011 03:09:49 +0000 (19:09 -0800)
1  2 
arch/arm/mach-tegra/tegra2_clocks.c

Simple merge