From: Dima Zavin <dima@android.com>
Date: Tue, 14 Dec 2010 22:25:27 +0000 (-0800)
Subject: Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
X-Git-Tag: firefly_0821_release~9834^2~254
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e8dc57547c9967474431ff1bf4ff1dc5c7cbf737;p=firefly-linux-kernel-4.4.55.git

Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36

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

Change-Id: Ia10990fca6221d4d7d0236073910d8c48bf6762b
---

e8dc57547c9967474431ff1bf4ff1dc5c7cbf737
diff --cc arch/arm/mach-tegra/tegra2_clocks.c
index c8f6ca9cfdd4,3625b8091c76..6aacf8f11f05
--- a/arch/arm/mach-tegra/tegra2_clocks.c
+++ b/arch/arm/mach-tegra/tegra2_clocks.c
@@@ -2035,7 -2035,7 +2035,8 @@@ struct clk_duplicate tegra_clk_duplicat
  	CLK_DUPLICATE("epp", "tegra_grhost", "epp"),
  	CLK_DUPLICATE("mpe", "tegra_grhost", "mpe"),
  	CLK_DUPLICATE("cop", "tegra-avp", "cop"),
+ 	CLK_DUPLICATE("vde", "tegra-aes", "vde"),
 +	CLK_DUPLICATE("usbd", "cpcap-otg", NULL),
  };
  
  #define CLK(dev, con, ck)	\