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

diff --cc arch/arm/common/fiq_debugger.c
Simple merge

diff --cc arch/arm/mach-tegra/Makefile
index 4159860c0e88e425ddaa6f5a6cfafc0ce395603d,869dd4cafdc33b93ecad8bcff960c43f93ebb290..069b4bce7541affcf61bf697bc1d6081d0add428
--- 1/arch/arm/mach-tegra/Makefile
--- 2/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@@ -1,8 -1,8 +1,9 @@@
  obj-y                                   += common.o
  obj-y                                   += io.o
  obj-y                                   += irq.o legacy_irq.o
 +obj-y                                 += syncpt.o
  obj-y                                   += clock.o
+ obj-y                                   += dvfs.o
  obj-y                                   += timer.o
  obj-y                                   += gpio.o
  obj-y                                   += pinmux.o

diff --cc arch/arm/mach-tegra/suspend.c
Simple merge

diff --cc arch/arm/mach-tegra/tegra2_clocks.c
index 1af224597751914ced2db7751825688e5a29c612,4a9e3e0b7f2e90d865d51be0b9c6a004e4a09a7b..2d9055a643579fb33a372a84fdd9d411889517f3
--- 1/arch/arm/mach-tegra/tegra2_clocks.c
--- 2/arch/arm/mach-tegra/tegra2_clocks.c
+++ b/arch/arm/mach-tegra/tegra2_clocks.c
@@@ -1876,6 -1975,7 +1975,8 @@@ struct clk_duplicate tegra_clk_duplicat
        CLK_DUPLICATE("3d", "tegra_grhost", "gr3d"),
        CLK_DUPLICATE("epp", "tegra_grhost", "epp"),
        CLK_DUPLICATE("mpe", "tegra_grhost", "mpe"),
+       CLK_DUPLICATE("cop", "tegra-avp", "cop"),
++      CLK_DUPLICATE("usbd", "cpcap-otg", NULL),
  };
  
  #define CLK(dev, con, ck)     \