Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Sat, 15 Jan 2011 01:32:40 +0000 (17:32 -0800)
committerColin Cross <ccross@android.com>
Sat, 15 Jan 2011 01:32:40 +0000 (17:32 -0800)
commitb8a4c1822ae3f05ee7a6db5c6dbc0efe5fd243dc
tree59b0fbe76a5095c58d9e11bbcae5f9137d3d4f06
parentbc22a7ecb2bf24324d914fb3463ebc5e8756c0c5
parent5edc1199f320e0d9226fe8b73711c6a171ce78de
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
arch/arm/mach-tegra/tegra2_clocks.c