| author | Praneeth Bajjuri <praneeth@ti.com> | |
| Thu, 25 Apr 2013 04:28:37 +0000 (23:28 -0500) | ||
| committer | Praneeth Bajjuri <praneeth@ti.com> | |
| Thu, 25 Apr 2013 04:28:37 +0000 (23:28 -0500) | ||
| commit | cde85a507c046da5e51ae877664c5a38211a7c77 | |
| tree | 5b2c2a4a552c424b76b51390db254b2ea88df7b9 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 182eb5ae1c1bd313254c1f5975c969b0ec20d3dc | commit | diff |
| parent | 91e9ffd414cd71be4cbed13ebfd6aab3c6e4dbb7 | commit | diff |
Merge branch 'ti-linux-3.8.y' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel into p-ti-linux-3.8.y
* 'ti-linux-3.8.y' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel: (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: Id5c2103629e67ffd32d522243003fa44f569cf68
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
* 'ti-linux-3.8.y' of git://git.ti.com/ti-linux-kernel/ti-linux-kernel: (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: Id5c2103629e67ffd32d522243003fa44f569cf68
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>