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

Conflicts:
	arch/arm/mach-tegra/Makefile

diff --cc arch/arm/mach-tegra/Makefile
index 029947b4f298b4b08dc718b3412096df19cc732f,8872cd54337f1f191765489971c3b318380600d1..4159860c0e88e425ddaa6f5a6cfafc0ce395603d
--- 1/arch/arm/mach-tegra/Makefile
--- 2/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@@ -46,23 -43,4 +46,24 @@@ obj-${CONFIG_MACH_VENTANA
  obj-${CONFIG_MACH_VENTANA}              += board-ventana-pinmux.o
  obj-${CONFIG_MACH_VENTANA}              += board-ventana-sdhci.o
  obj-${CONFIG_MACH_VENTANA}              += board-ventana-power.o
+ obj-${CONFIG_MACH_VENTANA}              += board-ventana-panel.o
 +
 +obj-${CONFIG_MACH_OLYMPUS}              += board-olympus.o
 +obj-${CONFIG_MACH_OLYMPUS}              += board-olympus-pinmux.o
 +obj-${CONFIG_MACH_OLYMPUS}              += board-olympus-panel.o
 +obj-${CONFIG_MACH_OLYMPUS}              += board-olympus-i2c.o
 +obj-${CONFIG_MACH_OLYMPUS}              += board-olympus-keypad.o
 +obj-${CONFIG_MACH_OLYMPUS}              += board-olympus-wifi.o
 +
 +obj-${CONFIG_MACH_STINGRAY}             += board-stingray.o
 +obj-${CONFIG_MACH_STINGRAY}             += board-stingray-pinmux.o
 +obj-${CONFIG_MACH_STINGRAY}             += board-stingray-panel.o
 +obj-${CONFIG_MACH_STINGRAY}             += board-stingray-keypad.o
 +obj-${CONFIG_MACH_STINGRAY}             += board-stingray-wifi.o
 +obj-${CONFIG_MACH_STINGRAY}             += board-stingray-sensors.o
 +obj-${CONFIG_MACH_STINGRAY}             += board-stingray-wlan_nvs.o
 +obj-${CONFIG_MACH_STINGRAY}             += board-stingray-touch.o
 +obj-${CONFIG_MACH_STINGRAY}             += board-stingray-power.o
 +obj-${CONFIG_MACH_STINGRAY}             += board-stingray-rfkill.o
 +obj-${CONFIG_MACH_STINGRAY}             += board-stingray-gps.o
 +obj-${CONFIG_MACH_STINGRAY}             += board-stingray-usbnet.o