Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Tue, 26 Oct 2010 01:51:19 +0000 (18:51 -0700)
committerColin Cross <ccross@android.com>
Tue, 26 Oct 2010 01:51:19 +0000 (18:51 -0700)
commit99efdba2169fbec390c4d475b8527ab83c8c565a
tree25a94c9621207bd94c2d8264a141649ac10ba58e
parent6aa5269144e3f93d39806d30e6439d100857a901
parentdb3af647fc5234637686cec8ba42be32db30d772
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36

Conflicts:
arch/arm/mach-tegra/tegra2_clocks.c

Change-Id: I175cf5b73d60abd4ac0a9a3f8216a2b7b2ebae84
arch/arm/common/fiq_debugger.c
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/suspend.c
arch/arm/mach-tegra/tegra2_clocks.c