Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Wed, 12 Jan 2011 08:04:17 +0000 (00:04 -0800)
committerColin Cross <ccross@android.com>
Wed, 12 Jan 2011 08:04:17 +0000 (00:04 -0800)
commit139d6ef99eb9741923c5d3a23c26da3edab0d573
tree3a502b370f3613ca132f93cdd71a8ae7ce4b63fc
parent9d91c8ebaf20a14cd2063b24a46ef561c3149187
parent33cd348d6791bdd4f2e7c4af30c9e7eefc22dd5a
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
arch/arm/mach-tegra/tegra2_clocks.c