Merge branch 'pm-linux-3.8.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux...
authorDan Murphy <dmurphy@ti.com>
Tue, 23 Apr 2013 16:05:46 +0000 (11:05 -0500)
committerDan Murphy <dmurphy@ti.com>
Tue, 23 Apr 2013 16:05:46 +0000 (11:05 -0500)
commit32b90931b26db66638e7a67aa72de4879f60e6a6
treef6f0317c127045f3056f7c1e68ddc251a1a5bcce
parent21ea3d6ad56e51613cad60372aec9fe4dac48890
parent36a2b8d10ee4f46f54afdb2e04e3ef8cf463ad52
Merge branch 'pm-linux-3.8.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree into ti-linux-3.8.y

TI-Feature: power_management
TI-Tree: git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree.git
TI-Branch: pm-linux-3.8.y

* 'pm-linux-3.8.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree: (33 commits)
  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
  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
  arm: add bandgap DT entry for OMAP5
  ARM: OMAP3+: use cpu0-cpufreq driver in device tree supported boot(v4)
  ...

Conflicts:
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/omap5.dtsi
arch/arm/configs/omap2plus_defconfig
arch/arm/mach-omap2/omap-mpuss-lowpower.c
arch/arm/mach-omap2/omap_hwmod_33xx_data.c

Signed-off-by: Dan Murphy <dmurphy@ti.com>
17 files changed:
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/omap3-beagle-xm.dts
arch/arm/boot/dts/omap3-beagle.dts
arch/arm/boot/dts/omap3-evm.dts
arch/arm/boot/dts/omap3-overo.dtsi
arch/arm/boot/dts/omap3.dtsi
arch/arm/boot/dts/omap4-sdp.dts
arch/arm/boot/dts/omap4.dtsi
arch/arm/boot/dts/omap5-sevm.dts
arch/arm/boot/dts/omap5-uevm.dts
arch/arm/boot/dts/omap5.dtsi
arch/arm/boot/dts/twl4030.dtsi
arch/arm/configs/omap2plus_defconfig
arch/arm/mach-omap2/board-generic.c
arch/arm/mach-omap2/cclock33xx_data.c
arch/arm/mach-omap2/cclock54xx_data.c
arch/arm/mach-omap2/omap_hwmod_33xx_data.c