Merge branch 'for-linus' into for-next

Merged upstream branch to make further fireworks development easier (and avoid conflicts earlier). Conflicts: sound/firewire/bebob/bebob_focusrite.c
2026-11-13 07:31:07 +00:00 · 2014-10-27 14:11:07 +01:00 · 2014-10-27 14:11:07 +01:00 · 85c24cd8d3
commit 85c24cd8d3
parent 49d776ffb5 d1d0b6b668
484 changed files with 15141 additions and 6387 deletions
--- a/include/acpi/acnames.h
+++ b/include/acpi/acnames.h
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
--- a/include/dt-bindings/clock/imx6qdl-clock.h
+++ b/include/dt-bindings/clock/imx6qdl-clock.h
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
--- a/include/linux/cpufreq-dt.h
+++ b/include/linux/cpufreq-dt.h
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
--- a/include/linux/crash_dump.h
+++ b/include/linux/crash_dump.h
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
--- a/include/linux/kgdb.h
+++ b/include/linux/kgdb.h
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
--- a/include/linux/mailbox_client.h
+++ b/include/linux/mailbox_client.h
--- a/include/linux/mailbox_controller.h
+++ b/include/linux/mailbox_controller.h
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
--- a/include/linux/oom.h
+++ b/include/linux/oom.h
--- a/include/linux/pl320-ipc.h
+++ b/include/linux/pl320-ipc.h
--- a/include/linux/pm_qos.h
+++ b/include/linux/pm_qos.h
--- a/include/linux/pnfs_osd_xdr.h
+++ b/include/linux/pnfs_osd_xdr.h
--- a/include/linux/string.h
+++ b/include/linux/string.h
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
--- a/include/linux/uio_driver.h
+++ b/include/linux/uio_driver.h
--- a/include/linux/uprobes.h
+++ b/include/linux/uprobes.h
--- a/include/linux/watchdog.h
+++ b/include/linux/watchdog.h
--- a/include/scsi/osd_initiator.h
+++ b/include/scsi/osd_initiator.h
--- a/include/scsi/osd_ore.h
+++ b/include/scsi/osd_ore.h
--- a/include/scsi/osd_protocol.h
+++ b/include/scsi/osd_protocol.h
--- a/include/scsi/osd_sec.h
+++ b/include/scsi/osd_sec.h
--- a/include/scsi/osd_sense.h
+++ b/include/scsi/osd_sense.h
--- a/include/scsi/osd_types.h
+++ b/include/scsi/osd_types.h
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
--- a/include/trace/events/ext4.h
+++ b/include/trace/events/ext4.h
--- a/include/trace/events/thermal.h
+++ b/include/trace/events/thermal.h
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
--- a/include/uapi/linux/fs.h
+++ b/include/uapi/linux/fs.h
--- a/include/uapi/linux/target_core_user.h
+++ b/include/uapi/linux/target_core_user.h