summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/l...Linus Torvalds2014-12-1734-858/+2787
|\
| *-. Merge branches 'thermal-core-fix', 'thermal-soc' and 'thermal-int340x' into nextZhang Rui2014-12-1330-825/+2744
| |\ \
| | | * Thermal/int340x: Clear the error value of the last acpi_bus_get_device() callIlkka Koskinen2014-12-091-0/+2
| | | * Thermal: fix platform_no_drv_owner.cocci warningsWu Fengguang2014-12-091-1/+0
| | | * Thermal/int340x: avoid unnecessary pointer castingJacob Pan2014-12-091-5/+5
| | | * thermal: int3403: Delete a check before thermal_zone_device_unregister()Markus Elfring2014-12-091-2/+1
| | | * thermal/int3400: export uuidsSrinivas Pandruvada2014-12-091-2/+78
| | * | Merge branch 'eduardo-soc-thermal' into thermal-socZhang Rui2014-12-0925-810/+2650
| | |\ \
| | | * \ Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalent...Zhang Rui2014-12-0925-810/+2650
| | | |\ \ | | | | |/ | | | |/|
| | | | * thermal: of: Extend current of-thermal.c code to allow setting emulated tempLukasz Majewski2014-12-082-0/+27
| | | | * thermal: of: Extend of-thermal to export table of trip pointsLukasz Majewski2014-12-082-0/+29
| | | | * thermal: of: Rename struct __thermal_trip to struct thermal_tripLukasz Majewski2014-12-082-18/+18
| | | | * thermal: of: Extend of-thermal.c to provide check if trip point is validLukasz Majewski2014-12-082-0/+27
| | | | * thermal: of: Extend of-thermal.c to provide number of trip pointsLukasz Majewski2014-12-082-0/+26
| | | | * thermal: armada: Remove support for A375-Z1 SoCEzequiel Garcia2014-11-242-28/+0
| | | | * thermal: rockchip: add driver for thermalCaesar Wang2014-11-243-0/+704
| | | | * dt-bindings: document Rockchip thermalCaesar Wang2014-11-241-0/+68
| | | | * thermal: exynos: remove exynos_tmu_data.h includeBartlomiej Zolnierkiewicz2014-11-204-117/+89
| | | | * thermal: exynos: remove __EXYNOS5420_TMU_DATA macroBartlomiej Zolnierkiewicz2014-11-201-38/+2
| | | | * thermal: exynos: remove SoC type ifdefsBartlomiej Zolnierkiewicz2014-11-203-67/+8
| | | | * thermal: exynos: remove test_mux pdata fieldBartlomiej Zolnierkiewicz2014-11-203-6/+3
| | | | * thermal: exynos: remove TMU_SUPPORT_MULTI_INST flagBartlomiej Zolnierkiewicz2014-11-202-15/+1
| | | | * thermal: exynos: remove TMU_SUPPORT_ADDRESS_MULTIPLE flagBartlomiej Zolnierkiewicz2014-11-203-42/+38
| | | | * thermal: exynos: remove TMU_SUPPORT_EMULATION flagBartlomiej Zolnierkiewicz2014-11-203-17/+9
| | | | * thermal: exynos: remove TMU_SUPPORT_EMUL_TIME flagBartlomiej Zolnierkiewicz2014-11-203-13/+7
| | | | * thermal: exynos: remove TMU_SUPPORT_FALLING_TRIP flagBartlomiej Zolnierkiewicz2014-11-203-21/+12
| | | | * thermal: exynos: add ->tmu_clear_irqs methodBartlomiej Zolnierkiewicz2014-11-203-71/+43
| | | | * thermal: exynos: add ->tmu_set_emulation methodBartlomiej Zolnierkiewicz2014-11-203-14/+34
| | | | * thermal: exynos: add get_emul_con_reg() helperBartlomiej Zolnierkiewicz2014-11-201-15/+23
| | | | * thermal: exynos: add ->tmu_read methodBartlomiej Zolnierkiewicz2014-11-203-25/+28
| | | | * thermal: exynos: add ->tmu_control methodBartlomiej Zolnierkiewicz2014-11-203-87/+60
| | | | * thermal: exynos: add get_con_reg() helperBartlomiej Zolnierkiewicz2014-11-201-9/+16
| | | | * thermal: exynos: add ->tmu_initialize methodBartlomiej Zolnierkiewicz2014-11-203-133/+159
| | | | * thermal: exynos: add get_th_reg() helperBartlomiej Zolnierkiewicz2014-11-201-14/+23
| | | | * thermal: exynos: add sanitize_temp_error() helperBartlomiej Zolnierkiewicz2014-11-201-13/+20
| | | | * thermal: exynos: remove TMU_SUPPORT_TRIM_RELOAD flagBartlomiej Zolnierkiewicz2014-11-203-12/+13
| | | | * thermal: exynos: remove TMU_SUPPORT_READY_STATUS flagBartlomiej Zolnierkiewicz2014-11-203-15/+8
| | | | * thermal: exynos: replace threshold_falling check by Exynos SoC type oneBartlomiej Zolnierkiewicz2014-11-201-1/+1
| | | | * thermal: exynos: simplify HW_TRIP level settingBartlomiej Zolnierkiewicz2014-11-204-13/+5
| | | | * thermal: exynos: replace tmu_pmin check by Exynos5440 oneBartlomiej Zolnierkiewicz2014-11-203-6/+2
| | | | * thermal: exynos: replace tmu_irqstatus check by Exynos5440 oneBartlomiej Zolnierkiewicz2014-11-203-7/+2
| | | | * thermal: exynos: remove needless emul_time_shift abstractionBartlomiej Zolnierkiewicz2014-11-203-8/+2
| | | | * thermal: exynos: remove needless emul_temp_shift abstractionBartlomiej Zolnierkiewicz2014-11-203-9/+2
| | | | * thermal: exynos: remove needless therm_trip_en_shift abstractionBartlomiej Zolnierkiewicz2014-11-203-8/+1
| | | | * thermal: exynos: remove needless therm_trip_[mode,mask]_shift abstractionsBartlomiej Zolnierkiewicz2014-11-203-17/+2
| | | | * thermal: exynos: remove needless test_mux_addr_shift abstractionBartlomiej Zolnierkiewicz2014-11-203-5/+1
| | | | * thermal: exynos: remove needless triminfo_ctrl abstractionBartlomiej Zolnierkiewicz2014-11-204-24/+7
| | | | * thermal: exynos: remove needless threshold_temp abstractionBartlomiej Zolnierkiewicz2014-11-203-5/+1
| | | | * thermal: exynos: remove needless tmu_status abstractionBartlomiej Zolnierkiewicz2014-11-204-11/+1
| | | | * thermal: exynos: remove needless triminfo_data abstractionBartlomiej Zolnierkiewicz2014-11-203-14/+5