Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4.2/rmi', 'for-4.2/sensor-hub', 'for-4.2/sjoy', 'for-4.2/sony' and 'for-4.2/wacom' into for-linus

Conflicts: drivers/hid/wacom_wac.c
2026-11-13 07:31:07 +00:00 · 2015-06-22 16:23:43 +02:00 · 2015-06-22 16:23:43 +02:00 · ec3b34e197
commit ec3b34e197
parent 817a312581 3e48138c2c 181a8b911d 81bb773fae 10e87dc42a 30ee72f0d2 6e5e9a06a2 b2723eb73c 2a6cdbdd4c
8178 changed files with 367247 additions and 207363 deletions
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
--- a/include/acpi/acpi_io.h
+++ b/include/acpi/acpi_io.h
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
--- a/include/acpi/platform/acenv.h
+++ b/include/acpi/platform/acenv.h
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
--- a/include/asm-generic/dma-mapping-common.h
+++ b/include/asm-generic/dma-mapping-common.h
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
--- a/include/asm-generic/seccomp.h
+++ b/include/asm-generic/seccomp.h
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
--- a/include/crypto/if_alg.h
+++ b/include/crypto/if_alg.h
--- a/include/crypto/rng.h
+++ b/include/crypto/rng.h
--- a/include/crypto/sha.h
+++ b/include/crypto/sha.h
--- a/include/crypto/sha1_base.h
+++ b/include/crypto/sha1_base.h
--- a/include/crypto/sha256_base.h
+++ b/include/crypto/sha256_base.h
--- a/include/crypto/sha512_base.h
+++ b/include/crypto/sha512_base.h
--- a/include/drm/bridge/dw_hdmi.h
+++ b/include/drm/bridge/dw_hdmi.h
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
--- a/include/drm/drm_atomic.h
+++ b/include/drm/drm_atomic.h
--- a/include/drm/drm_atomic_helper.h
+++ b/include/drm/drm_atomic_helper.h
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
--- a/include/drm/drm_crtc_helper.h
+++ b/include/drm/drm_crtc_helper.h
--- a/include/drm/drm_dp_helper.h
+++ b/include/drm/drm_dp_helper.h
--- a/include/drm/drm_dp_mst_helper.h
+++ b/include/drm/drm_dp_mst_helper.h
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
--- a/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
--- a/include/drm/drm_gem.h
+++ b/include/drm/drm_gem.h
--- a/include/drm/drm_modes.h
+++ b/include/drm/drm_modes.h
--- a/include/drm/drm_panel.h
+++ b/include/drm/drm_panel.h
--- a/include/drm/drm_pciids.h
+++ b/include/drm/drm_pciids.h
--- a/include/drm/drm_plane_helper.h
+++ b/include/drm/drm_plane_helper.h
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
--- a/include/dt-bindings/clock/exynos3250.h
+++ b/include/dt-bindings/clock/exynos3250.h
--- a/include/dt-bindings/clock/exynos5433.h
+++ b/include/dt-bindings/clock/exynos5433.h
--- a/include/dt-bindings/clock/imx6qdl-clock.h
+++ b/include/dt-bindings/clock/imx6qdl-clock.h
--- a/include/dt-bindings/clock/pistachio-clk.h
+++ b/include/dt-bindings/clock/pistachio-clk.h
--- a/include/dt-bindings/clock/qcom,gcc-ipq806x.h
+++ b/include/dt-bindings/clock/qcom,gcc-ipq806x.h
--- a/include/dt-bindings/clock/qcom,gcc-msm8916.h
+++ b/include/dt-bindings/clock/qcom,gcc-msm8916.h
--- a/include/dt-bindings/clock/r8a73a4-clock.h
+++ b/include/dt-bindings/clock/r8a73a4-clock.h
--- a/include/dt-bindings/clock/r8a7778-clock.h
+++ b/include/dt-bindings/clock/r8a7778-clock.h
--- a/include/dt-bindings/clock/r8a7790-clock.h
+++ b/include/dt-bindings/clock/r8a7790-clock.h
--- a/include/dt-bindings/clock/r8a7791-clock.h
+++ b/include/dt-bindings/clock/r8a7791-clock.h
--- a/include/dt-bindings/clock/sh73a0-clock.h
+++ b/include/dt-bindings/clock/sh73a0-clock.h
--- a/include/dt-bindings/clock/tegra124-car-common.h
+++ b/include/dt-bindings/clock/tegra124-car-common.h
--- a/include/dt-bindings/dma/jz4780-dma.h
+++ b/include/dt-bindings/dma/jz4780-dma.h
--- a/include/dt-bindings/gpio/meson8b-gpio.h
+++ b/include/dt-bindings/gpio/meson8b-gpio.h
--- a/include/dt-bindings/leds/common.h
+++ b/include/dt-bindings/leds/common.h
--- a/include/dt-bindings/media/omap3-isp.h
+++ b/include/dt-bindings/media/omap3-isp.h
--- a/include/dt-bindings/media/xilinx-vip.h
+++ b/include/dt-bindings/media/xilinx-vip.h
--- a/include/dt-bindings/mfd/arizona.h
+++ b/include/dt-bindings/mfd/arizona.h
--- a/include/dt-bindings/mfd/qcom-rpm.h
+++ b/include/dt-bindings/mfd/qcom-rpm.h
--- a/include/dt-bindings/pinctrl/mt65xx.h
+++ b/include/dt-bindings/pinctrl/mt65xx.h
--- a/include/dt-bindings/pinctrl/qcom,pmic-gpio.h
+++ b/include/dt-bindings/pinctrl/qcom,pmic-gpio.h
--- a/include/dt-bindings/pinctrl/qcom,pmic-mpp.h
+++ b/include/dt-bindings/pinctrl/qcom,pmic-mpp.h
--- a/include/dt-bindings/reset/qcom,gcc-msm8916.h
+++ b/include/dt-bindings/reset/qcom,gcc-msm8916.h
--- a/include/linux/a.out.h
+++ b/include/linux/a.out.h
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
--- a/include/linux/acpi_irq.h
+++ b/include/linux/acpi_irq.h
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
--- a/include/linux/arm-cci.h
+++ b/include/linux/arm-cci.h
--- a/include/linux/async_tx.h
+++ b/include/linux/async_tx.h
--- a/include/linux/bcm47xx_nvram.h
+++ b/include/linux/bcm47xx_nvram.h
--- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h
--- a/include/linux/bcma/bcma_driver_chipcommon.h
+++ b/include/linux/bcma/bcma_driver_chipcommon.h
--- a/include/linux/bcma/bcma_driver_gmac_cmn.h
+++ b/include/linux/bcma/bcma_driver_gmac_cmn.h
--- a/include/linux/bcma/bcma_driver_mips.h
+++ b/include/linux/bcma/bcma_driver_mips.h
--- a/include/linux/bcma/bcma_driver_pci.h
+++ b/include/linux/bcma/bcma_driver_pci.h
--- a/include/linux/bcma/bcma_driver_pcie2.h
+++ b/include/linux/bcma/bcma_driver_pcie2.h
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
--- a/include/linux/brcmphy.h
+++ b/include/linux/brcmphy.h
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
--- a/include/linux/can/led.h
+++ b/include/linux/can/led.h
--- a/include/linux/can/skb.h
+++ b/include/linux/can/skb.h
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
--- a/include/linux/ceph/ceph_features.h
+++ b/include/linux/ceph/ceph_features.h
--- a/include/linux/ceph/ceph_fs.h
+++ b/include/linux/ceph/ceph_fs.h
--- a/include/linux/ceph/debugfs.h
+++ b/include/linux/ceph/debugfs.h
--- a/include/linux/ceph/libceph.h
+++ b/include/linux/ceph/libceph.h
--- a/include/linux/ceph/osdmap.h
+++ b/include/linux/ceph/osdmap.h
--- a/include/linux/cleancache.h
+++ b/include/linux/cleancache.h
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
--- a/include/linux/clk/at91_pmc.h
+++ b/include/linux/clk/at91_pmc.h
--- a/include/linux/clk/shmobile.h
+++ b/include/linux/clk/shmobile.h
--- a/include/linux/clk/ti.h
+++ b/include/linux/clk/ti.h
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
--- a/include/linux/cma.h
+++ b/include/linux/cma.h
--- a/include/linux/compaction.h
+++ b/include/linux/compaction.h
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
--- a/include/linux/compiler-intel.h
+++ b/include/linux/compiler-intel.h
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
--- a/include/linux/console.h
+++ b/include/linux/console.h
--- a/include/linux/context_tracking.h
+++ b/include/linux/context_tracking.h
--- a/include/linux/context_tracking_state.h
+++ b/include/linux/context_tracking_state.h
--- a/Show more
+++ b/Show more