summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* scripts: coccinelle: check for redeclarationJulia Lawall2019-01-061-0/+3
* kconfig: remove unused "file" field of yylval unionMasahiro Yamada2019-01-061-1/+0
* nds32: remove redundant kernel-space generic-yMasahiro Yamada2019-01-061-10/+0
* nios2: remove unneeded HAS_DMA defineMasahiro Yamada2019-01-061-3/+0
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/l...Linus Torvalds2019-01-0532-135/+138
|\
| * thermal/intel: fixup for Kconfig string parsing tightening upStephen Rothwell2019-01-031-1/+1
| * Merge branches 'for-rc' and 'thermal-core' into nextZhang Rui2018-12-0730-123/+121
| |\
| | * drivers: thermal: Move QCOM_SPMI_TEMP_ALARM into the qcom subdirAmit Kucheria2018-12-075-13/+13
| | * drivers: thermal: Move various drivers for intel platforms into a subdirAmit Kucheria2018-12-0723-86/+95
| | * thermal: zx2967_thermal: simplify getting .driver_dataWolfram Sang2018-11-301-4/+2
| | * thermal: st: st_thermal: simplify getting .driver_dataWolfram Sang2018-11-301-4/+2
| | * thermal: spear_thermal: simplify getting .driver_dataWolfram Sang2018-11-301-5/+3
| | * thermal: rockchip_thermal: simplify getting .driver_dataWolfram Sang2018-11-301-5/+3
| | * thermal: int340x_thermal: int3400_thermal: simplify getting .driver_dataWolfram Sang2018-11-301-6/+3
| * | thermal: Fix locking in cooling device sysfs update cur_stateThara Gopinath2018-11-301-4/+7
| * | Thermal: do not clear passive state during system sleepWei Wang2018-11-301-4/+8
| * | thermal: remove unused function parameterLukasz Luba2018-11-301-4/+2
| |/
* | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalent...Linus Torvalds2019-01-0518-93/+383
|\ \
| * | thermal: generic-adc: Fix adc to temp interpolationBjorn Andersson2019-01-021-4/+8
| * | thermal: rcar_thermal: add R8A77990 supportYoshihiro Kaneko2019-01-021-0/+4
| * | dt-bindings: thermal: rcar-thermal: add R8A77990 supportYoshihiro Kaneko2019-01-021-2/+3
| * | thermal: rcar_thermal: add R8A774C0 supportFabrizio Castro2019-01-021-0/+4
| * | dt-bindings: thermal: rcar-thermal: add R8A774C0 supportFabrizio Castro2019-01-021-2/+3
| * | dt-bindings: cp110: document the thermal interrupt capabilitiesMiquel Raynal2019-01-021-0/+9
| * | dt-bindings: ap806: document the thermal interrupt capabilitiesMiquel Raynal2019-01-021-0/+7
| * | MAINTAINERS: thermal: add entry for Marvell MVEBU thermal driverMiquel Raynal2019-01-021-0/+5
| * | thermal: armada: add overheat interrupt supportMiquel Raynal2019-01-021-1/+269
| * | thermal: st: fix Makefile typoArnd Bergmann2019-01-021-1/+1
| * | thermal: uniphier: Convert to SPDX identifierKunihiko Hayashi2019-01-021-12/+1
| * | thermal/intel_powerclamp: Change to use DEFINE_SHOW_ATTRIBUTE macroYangtao Li2019-01-021-13/+1
| * | thermal: tegra: soctherm: Change to use DEFINE_SHOW_ATTRIBUTE macroYangtao Li2019-01-021-11/+1
| * | dt-bindings: thermal: tegra-bpmp: Add Tegra194 supportThierry Reding2019-01-022-1/+17
| * | thermal: imx: save one condition block for normal case of nvmem initializationAnson Huang2019-01-021-2/+3
| * | thermal: imx: fix for dependency on cpu-freqAnson Huang2019-01-022-13/+36
| * | thermal: tsens: qcom: do not create duplicate regmap debugfs entriesSrinivas Kandagatla2019-01-021-2/+10
| * | thermal: armada: Use PTR_ERR_OR_ZERO in armada_thermal_probe_legacy()YueHaibing2019-01-021-8/+2
| * | dt-bindings: thermal: rcar-gen3-thermal: All variants use 3 interruptsGeert Uytterhoeven2019-01-021-2/+1
| * | thermal: broadcom: use devm_thermal_zone_of_sensor_registerJulia Lawall2019-01-021-20/+4
| * | thermal: bcm2835: enable hwmon explicitlyMatthias Brugger2019-01-021-0/+11
| * | thermal: hwmon: inline helpers when CONFIG_THERMAL_HWMON is not setEduardo Valentin2019-01-021-2/+2
* | | Merge tag 'trace-v4.21-1' of git://git.kernel.org/pub/scm/linux/kernel/git/ro...Linus Torvalds2019-01-051-1/+1
|\ \ \
| * | | sh: ftrace: Fix missing parenthesis in WARN_ON()Steven Rostedt (VMware)2019-01-031-1/+1
* | | | Merge tag '4.21-smb3-small-fixes' of git://git.samba.org/sfrench/cifs-2.6Linus Torvalds2019-01-054-16/+32
|\ \ \ \
| * | | | smb3: add smb3.1.1 to default dialect listSteve French2019-01-032-14/+28
| * | | | cifs: fix confusing warning message on reconnectSteve French2019-01-021-1/+1
| * | | | smb3: fix large reads on encrypted connectionsPaul Aurich2019-01-021-1/+3
* | | | | Merge tag 'iomap-4.21-merge-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linuxLinus Torvalds2019-01-051-0/+12
|\ \ \ \ \
| * | | | | iomap: take responsibility for the filesystem iomap codeDarrick J. Wong2018-12-211-0/+12
* | | | | | Merge tag 'xfs-4.21-merge-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linuxLinus Torvalds2019-01-052-2/+0
|\ \ \ \ \ \
| * | | | | | xfs: xfs_fsops: drop useless LIST_HEADJulia Lawall2018-12-291-1/+0