Merge branches 'for-4.8/alps', 'for-4.8/apple', 'for-4.8/i2c-hid', 'for-4.8/uhid-offload-hid-device-add' and 'for-4.8/upstream' into for-linus

2026-11-10 20:48:12 +00:00 · 2016-07-28 10:48:15 +02:00 · 2016-07-28 10:48:15 +02:00 · e82a82c19f
commit e82a82c19f
parent 819d64e51d b5d9427549 d9f448e3d7 67f8ecc550 ddfe8483e9
7195 changed files with 434904 additions and 212069 deletions
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
--- a/drivers/Makefile
+++ b/drivers/Makefile
--- a/drivers/acpi/acpi_dbg.c
+++ b/drivers/acpi/acpi_dbg.c
--- a/drivers/acpi/acpi_processor.c
+++ b/drivers/acpi/acpi_processor.c
--- a/drivers/acpi/acpi_video.c
+++ b/drivers/acpi/acpi_video.c
--- a/drivers/acpi/acpica/exconfig.c
+++ b/drivers/acpi/acpica/exconfig.c
--- a/drivers/acpi/acpica/hwregs.c
+++ b/drivers/acpi/acpica/hwregs.c
--- a/drivers/acpi/acpica/nsparse.c
+++ b/drivers/acpi/acpica/nsparse.c
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
--- a/drivers/acpi/nfit.c
+++ b/drivers/acpi/nfit.c
--- a/drivers/acpi/nfit.h
+++ b/drivers/acpi/nfit.h
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
--- a/drivers/ata/libata-trace.c
+++ b/drivers/ata/libata-trace.c
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
--- a/drivers/ata/pata_icside.c
+++ b/drivers/ata/pata_icside.c
--- a/drivers/ata/sata_dwc_460ex.c
+++ b/drivers/ata/sata_dwc_460ex.c
--- a/drivers/ata/sata_highbank.c
+++ b/drivers/ata/sata_highbank.c
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
--- a/drivers/base/Makefile
+++ b/drivers/base/Makefile
--- a/drivers/base/devcoredump.c
+++ b/drivers/base/devcoredump.c
--- a/drivers/base/isa.c
+++ b/drivers/base/isa.c
--- a/drivers/base/module.c
+++ b/drivers/base/module.c
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
--- a/drivers/base/power/opp/cpu.c
+++ b/drivers/base/power/opp/cpu.c
--- a/drivers/base/power/opp/of.c
+++ b/drivers/base/power/opp/of.c
--- a/drivers/base/power/opp/opp.h
+++ b/drivers/base/power/opp/opp.h
--- a/drivers/bcma/driver_chipcommon_sflash.c
+++ b/drivers/bcma/driver_chipcommon_sflash.c
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
--- a/drivers/block/zram/zcomp.c
+++ b/drivers/block/zram/zcomp.c
--- a/drivers/block/zram/zcomp.h
+++ b/drivers/block/zram/zcomp.h
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
--- a/drivers/block/zram/zram_drv.h
+++ b/drivers/block/zram/zram_drv.h
--- a/drivers/bus/Kconfig
+++ b/drivers/bus/Kconfig
--- a/drivers/bus/arm-ccn.c
+++ b/drivers/bus/arm-ccn.c
--- a/drivers/bus/brcmstb_gisb.c
+++ b/drivers/bus/brcmstb_gisb.c
--- a/drivers/bus/mips_cdmm.c
+++ b/drivers/bus/mips_cdmm.c
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
--- a/drivers/char/xillybus/xillybus_of.c
+++ b/drivers/char/xillybus/xillybus_of.c
--- a/drivers/char/xillybus/xillybus_pcie.c
+++ b/drivers/char/xillybus/xillybus_pcie.c
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
--- a/drivers/clk/at91/clk-h32mx.c
+++ b/drivers/clk/at91/clk-h32mx.c
--- a/drivers/clk/axis/Makefile
+++ b/drivers/clk/axis/Makefile
--- a/drivers/clk/axis/clk-artpec6.c
+++ b/drivers/clk/axis/clk-artpec6.c
--- a/drivers/clk/axs10x/Makefile
+++ b/drivers/clk/axs10x/Makefile
--- a/drivers/clk/axs10x/i2s_pll_clock.c
+++ b/drivers/clk/axs10x/i2s_pll_clock.c
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
--- a/drivers/clk/bcm/clk-kona-setup.c
+++ b/drivers/clk/bcm/clk-kona-setup.c
--- a/drivers/clk/clk-clps711x.c
+++ b/drivers/clk/clk-clps711x.c
--- a/drivers/clk/clk-composite.c
+++ b/drivers/clk/clk-composite.c
--- a/drivers/clk/clk-divider.c
+++ b/drivers/clk/clk-divider.c
--- a/drivers/clk/clk-fixed-factor.c
+++ b/drivers/clk/clk-fixed-factor.c
--- a/drivers/clk/clk-fixed-rate.c
+++ b/drivers/clk/clk-fixed-rate.c
--- a/drivers/clk/clk-fractional-divider.c
+++ b/drivers/clk/clk-fractional-divider.c
--- a/drivers/clk/clk-gate.c
+++ b/drivers/clk/clk-gate.c
--- a/drivers/clk/clk-gpio.c
+++ b/drivers/clk/clk-gpio.c
--- a/drivers/clk/clk-ls1x.c
+++ b/drivers/clk/clk-ls1x.c
--- a/drivers/clk/clk-mux.c
+++ b/drivers/clk/clk-mux.c
--- a/drivers/clk/clk-nspire.c
+++ b/drivers/clk/clk-nspire.c
--- a/drivers/clk/clk-oxnas.c
+++ b/drivers/clk/clk-oxnas.c
--- a/drivers/clk/clk-palmas.c
+++ b/drivers/clk/clk-palmas.c
--- a/drivers/clk/clk-pwm.c
+++ b/drivers/clk/clk-pwm.c
--- a/drivers/clk/clk-qoriq.c
+++ b/drivers/clk/clk-qoriq.c
--- a/drivers/clk/clk-rk808.c
+++ b/drivers/clk/clk-rk808.c
--- a/drivers/clk/clk-tango4.c
+++ b/drivers/clk/clk-tango4.c
--- a/drivers/clk/clk-twl6040.c
+++ b/drivers/clk/clk-twl6040.c
--- a/drivers/clk/clk-wm831x.c
+++ b/drivers/clk/clk-wm831x.c
--- a/drivers/clk/clk-xgene.c
+++ b/drivers/clk/clk-xgene.c
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
--- a/drivers/clk/clkdev.c
+++ b/drivers/clk/clkdev.c
--- a/drivers/clk/hisilicon/Kconfig
+++ b/drivers/clk/hisilicon/Kconfig
--- a/drivers/clk/hisilicon/Makefile
+++ b/drivers/clk/hisilicon/Makefile
--- a/drivers/clk/hisilicon/clk-hi3519.c
+++ b/drivers/clk/hisilicon/clk-hi3519.c
--- a/drivers/clk/hisilicon/clk.c
+++ b/drivers/clk/hisilicon/clk.c
--- a/drivers/clk/hisilicon/clk.h
+++ b/drivers/clk/hisilicon/clk.h
--- a/drivers/clk/hisilicon/reset.c
+++ b/drivers/clk/hisilicon/reset.c
--- a/drivers/clk/hisilicon/reset.h
+++ b/drivers/clk/hisilicon/reset.h
--- a/drivers/clk/imx/clk-gate2.c
+++ b/drivers/clk/imx/clk-gate2.c
--- a/drivers/clk/imx/clk-imx35.c
+++ b/drivers/clk/imx/clk-imx35.c
--- a/drivers/clk/imx/clk-imx6sx.c
+++ b/drivers/clk/imx/clk-imx6sx.c
--- a/drivers/clk/imx/clk-imx7d.c
+++ b/drivers/clk/imx/clk-imx7d.c
--- a/Show more
+++ b/Show more