Merge with mainline to bring in the latest thermal and other changes.
| -rw-r--r-- | include/acpi/acbuffer.h | 14 | |
| -rw-r--r-- | include/acpi/acnames.h | 5 | |
| -rw-r--r-- | include/acpi/acpi_bus.h | 37 | |
| -rw-r--r-- | include/acpi/acpixf.h | 3 | |
| -rw-r--r-- | include/acpi/actbl1.h | 19 | |
| -rw-r--r-- | include/acpi/actbl3.h | 9 | |
| -rw-r--r-- | include/acpi/actypes.h | 8 | |
| -rw-r--r-- | include/acpi/processor.h | 15 | |
| -rw-r--r-- | include/asm-generic/atomic.h | 194 | |
| -rw-r--r-- | include/asm-generic/atomic64.h | 20 | |
| -rw-r--r-- | include/asm-generic/barrier.h | 8 | |
| -rw-r--r-- | include/asm-generic/clkdev.h | 2 | |
| -rw-r--r-- | include/asm-generic/cputime_jiffies.h | 2 | |
| -rw-r--r-- | include/asm-generic/cputime_nsecs.h | 2 | |
| -rw-r--r-- | include/asm-generic/dma-contiguous.h | 9 | |
| -rw-r--r-- | include/asm-generic/dma-mapping-common.h | 17 | |
| -rw-r--r-- | include/asm-generic/futex.h | 114 | |
| -rw-r--r-- | include/asm-generic/gpio.h | 2 | |
| -rw-r--r-- | include/asm-generic/hash.h | 9 | |
| -rw-r--r-- | include/asm-generic/io.h | 753 | |
| -rw-r--r-- | include/asm-generic/irq_work.h | 10 | |
| -rw-r--r-- | include/asm-generic/mm_hooks.h | 17 | |
| -rw-r--r-- | include/asm-generic/msi.h | 32 | |
| -rw-r--r-- | include/asm-generic/pgtable.h | 56 | |
| -rw-r--r-- | include/asm-generic/preempt.h | 3 | |
| -rw-r--r-- | include/asm-generic/seccomp.h | 30 | |
| -rw-r--r-- | include/asm-generic/sections.h | 4 | |
| -rw-r--r-- | include/asm-generic/syscall.h | 2 | |
| -rw-r--r-- | include/asm-generic/tlb.h | 57 | |
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 4 | |
| -rw-r--r-- | include/crypto/drbg.h | 19 | |
| -rw-r--r-- | include/crypto/hash.h | 497 | |
| -rw-r--r-- | include/crypto/if_alg.h | 1 | |
| -rw-r--r-- | include/crypto/internal/hash.h | 9 | |
| -rw-r--r-- | include/crypto/mcryptd.h | 112 | |
| -rw-r--r-- | include/crypto/public_key.h | 6 | |
| -rw-r--r-- | include/crypto/rng.h | 80 | |
| -rw-r--r-- | include/drm/ati_pcigart.h | 30 | |
| -rw-r--r-- | include/drm/drmP.h | 750 | |
| -rw-r--r-- | include/drm/drm_agpsupport.h | 26 | |
| -rw-r--r-- | include/drm/drm_atomic.h | 69 | |
| -rw-r--r-- | include/drm/drm_atomic_helper.h | 126 | |
| -rw-r--r-- | include/drm/drm_buffer.h | 148 | |
| -rw-r--r-- | include/drm/drm_crtc.h | 353 | |
| -rw-r--r-- | include/drm/drm_crtc_helper.h | 13 | |
| -rw-r--r-- | include/drm/drm_displayid.h | 76 | |
| -rw-r--r-- | include/drm/drm_dp_helper.h | 42 | |
| -rw-r--r-- | include/drm/drm_dp_mst_helper.h | 10 | |
| -rw-r--r-- | include/drm/drm_edid.h | 109 | |
| -rw-r--r-- | include/drm/drm_fb_helper.h | 7 | |
| -rw-r--r-- | include/drm/drm_flip_work.h | 33 | |
| -rw-r--r-- | include/drm/drm_gem.h | 183 | |
| -rw-r--r-- | include/drm/drm_gem_cma_helper.h | 34 | |
| -rw-r--r-- | include/drm/drm_legacy.h | 203 | |
| -rw-r--r-- | include/drm/drm_memory.h | 59 | |
| -rw-r--r-- | include/drm/drm_mipi_dsi.h | 96 | |
| -rw-r--r-- | include/drm/drm_modeset_lock.h | 23 | |
| -rw-r--r-- | include/drm/drm_pciids.h | 1 | |
| -rw-r--r-- | include/drm/drm_plane_helper.h | 44 | |
| -rw-r--r-- | include/drm/drm_usb.h | 15 | |
| -rw-r--r-- | include/drm/i915_pciids.h | 17 | |
| -rw-r--r-- | include/drm/ttm/ttm_bo_api.h | 49 | |
| -rw-r--r-- | include/drm/ttm/ttm_bo_driver.h | 32 | |
| -rw-r--r-- | include/drm/ttm/ttm_execbuf_util.h | 31 | |
| -rw-r--r-- | include/dt-bindings/arm/ux500_pm_domains.h | 15 | |
| -rw-r--r-- | include/dt-bindings/clock/exynos3250.h | 27 | |
| -rw-r--r-- | include/dt-bindings/clock/exynos4.h | 12 | |
| -rw-r--r-- | include/dt-bindings/clock/exynos4415.h | 360 | |
| -rw-r--r-- | include/dt-bindings/clock/exynos7-clk.h | 92 | |
| -rw-r--r-- | include/dt-bindings/clock/hix5hd2-clock.h | 27 | |
| -rw-r--r-- | include/dt-bindings/clock/imx5-clock.h | 5 | |
| -rw-r--r-- | include/dt-bindings/clock/imx6qdl-clock.h | 43 | |
| -rw-r--r-- | include/dt-bindings/clock/imx6sl-clock.h | 30 | |
| -rw-r--r-- | include/dt-bindings/clock/imx6sx-clock.h | 25 | |
| -rw-r--r-- | include/dt-bindings/clock/marvell,mmp2.h | 74 | |
| -rw-r--r-- | include/dt-bindings/clock/marvell,pxa168.h | 57 | |
| -rw-r--r-- | include/dt-bindings/clock/marvell,pxa910.h | 54 | |
| -rw-r--r-- | include/dt-bindings/clock/maxim,max77686.h | 23 | |
| -rw-r--r-- | include/dt-bindings/clock/maxim,max77802.h | 22 | |
| -rw-r--r-- | include/dt-bindings/clock/pxa-clock.h | 77 | |
| -rw-r--r-- | include/dt-bindings/clock/qcom,mmcc-apq8084.h | 2 | |
| -rw-r--r-- | include/dt-bindings/clock/r8a7740-clock.h | 78 | |
| -rw-r--r-- | include/dt-bindings/clock/r8a7790-clock.h | 13 | |
| -rw-r--r-- | include/dt-bindings/clock/r8a7791-clock.h | 10 | |
| -rw-r--r-- | include/dt-bindings/clock/r8a7794-clock.h | 89 | |
| -rw-r--r-- | include/dt-bindings/clock/rk3188-cru-common.h | 1 | |
| -rw-r--r-- | include/dt-bindings/clock/rk3288-cru.h | 95 | |
| -rw-r--r-- | include/dt-bindings/clock/rockchip,rk808.h | 11 | |
| -rw-r--r-- | include/dt-bindings/clock/stih407-clks.h | 86 | |
| -rw-r--r-- | include/dt-bindings/clock/stih410-clks.h | 25 | |
| -rw-r--r-- | include/dt-bindings/clock/tegra114-car.h | 2 | |
| -rw-r--r-- | include/dt-bindings/clock/tegra124-car.h | 8 | |
| -rw-r--r-- | include/dt-bindings/clock/tegra20-car.h | 2 | |
| -rw-r--r-- | include/dt-bindings/clock/vf610-clock.h | 40 | |
| -rw-r--r-- | include/dt-bindings/dma/at91.h | 25 | |
| -rw-r--r-- | include/dt-bindings/interrupt-controller/mips-gic.h | 9 | |
| -rw-r--r-- | include/dt-bindings/memory/tegra114-mc.h | 25 | |
| -rw-r--r-- | include/dt-bindings/memory/tegra124-mc.h | 31 | |
| -rw-r--r-- | include/dt-bindings/memory/tegra30-mc.h | 24 | |
| -rw-r--r-- | include/dt-bindings/phy/phy.h | 19 | |
| -rw-r--r-- | include/dt-bindings/pinctrl/at91.h | 5 | |
| -rw-r--r-- | include/dt-bindings/pinctrl/dra.h | 4 | |
| -rw-r--r-- | include/dt-bindings/pinctrl/qcom,pmic-gpio.h | 142 | |
| -rw-r--r-- | include/dt-bindings/pinctrl/qcom,pmic-mpp.h | 44 | |
| -rw-r--r-- | include/dt-bindings/pinctrl/rockchip.h | 2 | |
| -rw-r--r-- | include/dt-bindings/regulator/maxim,max77802.h | 18 | |
| -rw-r--r-- | include/dt-bindings/reset-controller/stih407-resets.h | 61 | |
| -rw-r--r-- | include/dt-bindings/sound/cs35l32.h | 26 | |
| -rw-r--r-- | include/dt-bindings/thermal/tegra124-soctherm.h | 13 | |
| -rw-r--r-- | include/dt-bindings/thermal/thermal.h | 2 | |
| -rw-r--r-- | include/keys/asymmetric-type.h | 41 | |
| -rw-r--r-- | include/keys/user-type.h | 1 | |
| -rw-r--r-- | include/kvm/arm_arch_timer.h | 10 | |
| -rw-r--r-- | include/kvm/arm_vgic.h | 136 | |
| -rw-r--r-- | include/linux/acpi.h | 175 | |
| -rw-r--r-- | include/linux/aer.h | 2 | |
| -rw-r--r-- | include/linux/ahci_platform.h | 13 | |
| -rw-r--r-- | include/linux/amba/bus.h | 16 | |
| -rw-r--r-- | include/linux/ata_platform.h | 5 | |
| -rw-r--r-- | |