Merge remote-tracking branch 'origin/p-ti-linux-3.8.y' into p-ti-android-3.8.y
authorPraneeth Bajjuri <praneeth@ti.com>
Thu, 25 Apr 2013 04:43:47 +0000 (23:43 -0500)
committerPraneeth Bajjuri <praneeth@ti.com>
Thu, 25 Apr 2013 04:43:47 +0000 (23:43 -0500)
commit5d79b66e9ff2cfac584966fcd967abf7ef49d042
treede5c4359e2bd14ef5749396b8e82e7576ee85b02
parentde4556ecce15a99868fc5ad92092e322b26e3d95
parentcde85a507c046da5e51ae877664c5a38211a7c77
Merge remote-tracking branch 'origin/p-ti-linux-3.8.y' into p-ti-android-3.8.y

* origin/p-ti-linux-3.8.y: (41 commits)
  TI-Integration:Fix auto merge issue on 33xx hwmod for ocmc ram
  staging: ti-soc-thermal: fix device removal
  staging: ti-soc-thermal: update OMAP5 extrapolation rules
  staging: ti-soc-thermal: introduce OMAP4430 extrapolation constants
  staging: ti-soc-thermal: Remove TC1/TC2 TODO (already done)
  staging: ti-soc-thermal: fix min/max TODO (already done)
  staging: ti-soc-thermal: update TODO list
  staging: ti-soc-thermal: Add get_trend support
  staging: ti-soc-thermal:Introduce ti_bandgap_get_trend function for OMAP5
  staging: ti-soc-thermal: Enable HISTORY_BUFFER Feature for OMAP5
  staging: ti-soc-thermal: Introduce HAS_HISTORY_BUFFER feature for bandgap
  staging: ti-soc-thermal: Modify update_interval r/w functions to incorporate the OMAP5 feature of COUNTER_DELAY.
  staging: ti-soc-thermal: Enable COUNTER_DELAY feature for OMAP5
  staging: ti-soc-thermal: Introduce HAS_COUNTER_DELAY feature for bandgap
  staging: ti-soc-thermal: Initialise counter_delay field for OMAP5 sensors
  staging: ti-soc-thermal: Add counter_delay_mask field to temp_sensor_registers struct
  TI-Integration:arch: arm: dts: Remove omap5-panda.dts
  arm: omap2plus_defconfig: enable TI bandgap driver
  staging: ti-soc-thermal: defer probe if cpufreq is not ready
  cpufreq: Add a get_current_driver helper
  ...

Change-Id: Ice0f63835285ed24ed02423f5295cb55e555b3f2
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
arch/arm/Kconfig
drivers/cpufreq/Kconfig
include/linux/cpufreq.h