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

diff --cc arch/arm/mach-tegra/Makefile
Simple merge

diff --cc arch/arm/mach-tegra/board-ventana.c
index a1d55e71a82068880cafdfc14618b7e2edc40902,82e3a22efa3ecdb9081fb47cdc7c20b9a7a8e314..60948ad9dba449ab2dc02b1ad5ee74fd0e507b9f
--- 1/arch/arm/mach-tegra/board-ventana.c
--- 2/arch/arm/mach-tegra/board-ventana.c
+++ b/arch/arm/mach-tegra/board-ventana.c
@@@ -33,8 -33,8 +33,9 @@@
  #include <linux/gpio.h>
  #include <linux/gpio_keys.h>
  #include <linux/input.h>
 +#include <linux/usb/android_composite.h>
  
+ #include <mach/clk.h>
  #include <mach/iomap.h>
  #include <mach/irqs.h>
  #include <mach/pinmux.h>