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

Conflicts:
	drivers/misc/Kconfig
	drivers/misc/Makefile

Change-Id: I826244513f799fdd2fb0269abad3271c96661293

diff --cc drivers/misc/Kconfig
index 0c273c04a306b69704a59813e5cb0324dbb1d35e,aad1247743f75448de90fd92d223b7a26312b264..c0377ca064ae989ad3ca79f4f831c888674ef085
--- 1/drivers/misc/Kconfig
--- 2/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@@ -332,14 -321,14 +332,22 @@@ config HMC635
          This driver provides support for the Honeywell HMC6352 compass,
          providing configuration and heading data via sysfs.
  
 +config SENSORS_AK8975
 +      tristate "AK8975 compass support"
 +      default n
 +      depends on I2C
 +      help
 +        If you say yes here you get support for Asahi Kasei's
 +        orientation sensor AK8975.
 +
+ config SENSORS_NCT1008
+       tristate "ON Semiconductor Temperature Sensor"
+       default n
+       depends on I2C
+       help
+        Say yes here if you wish to include the ON Semiconductor
+        NCT1008 Temperature sensor.
+ 
  config EP93XX_PWM
        tristate "EP93xx PWM support"
        depends on ARCH_EP93XX

diff --cc drivers/misc/Makefile
index 249ac2683aa5838a7f82fa5aca8db13436846e66,51f2787d8d15a85d46062e1dd0b69dc2fb5934b6..8edb901179292e30c92a7c2285202e6e7acef2b3
--- 1/drivers/misc/Makefile
--- 2/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@@ -38,6 -35,4 +38,7 @@@ obj-y                         += eeprom
  obj-y                         += cb710/
  obj-$(CONFIG_VMWARE_BALLOON)  += vmw_balloon.o
  obj-$(CONFIG_ARM_CHARLCD)     += arm-charlcd.o
 +obj-$(CONFIG_WL127X_RFKILL)   += wl127x-rfkill.o
 +obj-$(CONFIG_APANIC)          += apanic.o
 +obj-$(CONFIG_SENSORS_AK8975)  += akm8975.o
+ obj-$(CONFIG_SENSORS_NCT1008) += nct1008.o