Merge remote-tracking branch 'vhost/linux-next'

Merge remote-tracking branch 'pinctrl/for-next'

Merge remote-tracking branch 'bcon/master'

Conflicts:
drivers/block/Kconfig

Merge remote-tracking branch 'scsi/for-next'

Merge remote-tracking branch 'char-misc/char-misc-next'

Merge remote-tracking branch 'staging/staging-next'

Merge remote-tracking branch 'usb-gadget/next'

Conflicts:
drivers/usb/gadget/udc-core.c
drivers/usb/host/ehci-tegra.c
drivers/usb/musb/omap2430.c
drivers/usb/musb/tusb6010.c

Merge remote-tracking branch 'usb/usb-next'

Merge remote-tracking branch 'tty/tty-next'

Conflicts:
drivers/tty/serial/sh-sci.c

Merge remote-tracking branch 'driver-core/driver-core-next'

Conflicts:
net/core/net-sysfs.c

Merge remote-tracking branch 'leds/for-next'

Merge remote-tracking branch 'regmap/for-next'

Merge remote-tracking branch 'drivers-x86/linux-next'

Merge remote-tracking branch 'workqueues/for-next'

Merge remote-tracking branch 'xen-tip/linux-next'

Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'

Conflicts:
mm/Kconfig

Merge remote-tracking branch 'kvm/linux-next'

Merge remote-tracking branch 'rcu/rcu/next'

Merge remote-tracking branch 'ftrace/for-next'

Merge remote-tracking branch 'tip/auto-latest'

Merge remote-tracking branch 'spi/for-next'

Merge remote-tracking branch 'devicetree/devicetree/next'

Merge remote-tracking branch 'edac-amd/for-next'

Merge remote-tracking branch 'trivial/for-next'

Merge remote-tracking branch 'selinux/master'

Conflicts:
security/selinux/hooks.c

Merge remote-tracking branch 'security/next'

Merge remote-tracking branch 'regulator/for-next'

Merge remote-tracking branch 'fbdev/for-next'

Merge remote-tracking branch 'mfd-lj/for-mfd-next'

Merge remote-tracking branch 'mfd/master'

Merge remote-tracking branch 'md/for-next'

Merge remote-tracking branch 'slab/for-next'

Merge remote-tracking branch 'kgdb/kgdb-next'

Merge remote-tracking branch 'mmc/mmc-next'

Merge remote-tracking branch 'block/for-next'

Merge remote-tracking branch 'cgroup/for-next'

Merge remote-tracking branch 'virtio/virtio-next'

Merge remote-tracking branch 'sound-asoc/for-next'

Merge remote-tracking branch 'sound/for-next'

Merge remote-tracking branch 'drm-intel/for-linux-next'

Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_pm.c

Merge remote-tracking branch 'drm/drm-next'

Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/qxl/qxl_release.c

Merge remote-tracking branch 'crypto/master'

Merge remote-tracking branch 'l2-mtd/master'

Merge remote-tracking branch 'bluetooth/master'

Merge remote-tracking branch 'wireless-next/master'

Conflicts:
drivers/net/ethernet/broadcom/Kconfig

Merge remote-tracking branch 'ipsec-next/master'

Merge remote-tracking branch 'net-next/master'

Merge remote-tracking branch 'slave-dma/next'

Merge remote-tracking branch 'dlm/next'

Merge remote-tracking branch 'ieee1394/for-next'

Merge remote-tracking branch 'idle/next'

Merge remote-tracking branch 'pm/linux-next'

Merge remote-tracking branch 'libata/for-next'

Merge remote-tracking branch 'kbuild/for-next'

Merge remote-tracking branch 'v4l-dvb/master'

Merge remote-tracking branch 'hwmon-staging/hwmon-next'

Merge branch 'jdelvare-hwmon/master'

Merge remote-tracking branch 'hid/for-next'

Merge remote-tracking branch 'pci/next'

Merge remote-tracking branch 'vfs/for-next'

Conflicts:
fs/ext4/namei.c
mm/shmem.c

Merge remote-tracking branch 'xfs/for-next'

Merge remote-tracking branch 'v9fs/for-next'

Merge remote-tracking branch 'ocfs2/linux-next'

Merge remote-tracking branch 'nfsd/nfsd-next'

Merge remote-tracking branch 'nfs/linux-next'

Merge remote-tracking branch 'logfs/master'

Merge remote-tracking branch 'gfs2/master'

Merge remote-tracking branch 'f2fs/dev'

Merge remote-tracking branch 'ext3/for_next'

Merge remote-tracking branch 'cifs/for-next'

Merge remote-tracking branch 'ceph/master'

Merge remote-tracking branch 'btrfs/next'

Merge remote-tracking branch 'tile/master'

Merge remote-tracking branch 'sh/sh-latest'

Conflicts:
arch/sh/kernel/cpu/sh2a/Makefile
include/linux/serial_sci.h

Merge remote-tracking branch 's390/features'

Merge remote-tracking branch 'parisc-hd/for-next'

Merge remote-tracking branch 'mips/mips-for-linux-next'

Merge remote-tracking branch 'microblaze/next'

Merge remote-tracking branch 'metag/for-next'

Merge remote-tracking branch 'm68knommu/for-next'

Merge remote-tracking branch 'ia64/next'

Conflicts:
arch/ia64/configs/generic_defconfig
arch/ia64/configs/gensparse_defconfig
arch/ia64/configs/tiger_defconfig
arch/ia64/configs/xen_domu_defconfig

Merge remote-tracking branch 'cris/for-next'

Conflicts:
arch/cris/arch-v32/drivers/Kconfig

Merge remote-tracking branch 'blackfin/for-linus'

Merge remote-tracking branch 'arm/for-next'

Merge remote-tracking branch 'arc/for-next'

Merge remote-tracking branch 'drm-intel-fixes/drm-intel-fixes'

Merge remote-tracking branch 'rr-fixes/fixes'

Merge remote-tracking branch 'staging.current/staging-linus'

Merge remote-tracking branch 'wireless/master'

Merge remote-tracking branch 'sparc/master'

Merge remote-tracking branch 'metag-fixes/fixes'

Merge remote-tracking branch 'origin/master'

Merge branch 'acpi-video-next' into linux-next

* acpi-video-next:
  ACPI: blacklist win8 OSI for ASUS Zenbook Prime UX31A
  ACPI / video: drop unused fields from struct acpi_video_brightness_flags
  ACPI / video: remove unnecessary type casting
  ACPI / video: trivial style cleanups
  ACPI / video: trivial costmetic cleanups

Conflicts:
drivers/acpi/video.c

Merge branch 'pnp-next' into linux-next

* pnp-next:
  PNP: convert PNP driver bus legacy pm_ops to dev_pm_ops

Merge branch 'pm-opp-next' into linux-next

* pm-opp-next:
  PM / OPP: Export opp_add()

Merge branch 'pm-cpufreq-next' into linux-next

* pm-cpufreq-next:
  cpufreq: Pass policy to cpufreq_add_policy_cpu()
  cpufreq: Avoid double kobject_put() for the same kobject in error code path
  cpufreq: Do not hold driver module references for additional policy CPUs
  cpufreq: Don't pass CPU to cpufreq_add_dev_{symlink|interface}()
  cpufreq: Remove extra variables from cpufreq_add_dev_symlink()
  cpufreq: Perform light-weight init/teardown during suspend/resume
  cpufreq: Preserve policy structure across suspend/resume
  cpufreq: Introduce a flag ('frozen') to separate full vs temporary init/teardown
  cpufreq: Extract the handover of policy cpu to a helper function
  cpufreq: Extract non-interface related stuff from cpufreq_add_dev_interface
  cpufreq: Add helper to perform alloc/free of policy structure
  cpufreq: Fix misplaced call to cpufreq_update_policy()

Merge branch 'acpi-assorted-next' into linux-next

* acpi-assorted-next:
  ACPI: Do not fail acpi_bind_one() if device is already bound correctly
  ACPI: Move acpi_bus_get_device() from bus.c to scan.c
  ACPI / scan: Allow platform device creation without any IO resources
  ACPI / PCI: acpi_pci_irq_enable() must return an error if ACPI cannot map an IRQ.
  ACPI: Cleanup sparse warning on acpi_os_initialize1()
  platform / thinkpad: Remove deprecated hotkey_report_mode parameter
  ACPI: Remove the old /proc/acpi/event interface

Merge branch 'acpi-sleep-next' into linux-next

* acpi-sleep-next:
  x86 / tboot / ACPI: Fail extended mode reduced hardware sleep
  xen / ACPI: notify xen when reduced hardware sleep is available
  ACPI / sleep: Introduce acpi_os_prepare_extended_sleep() for extended sleep path

Merge branch 'acpi-pm-next' into linux-next

* acpi-pm-next:
  ACPI / PM: Add state information to error message in acpi_device_set_power()
  ACPI / PM: Remove redundant power manageable check from acpi_bus_set_power()
  ACPI / PM: Use ACPI_STATE_D3_COLD instead of ACPI_STATE_D3 everywhere
  ACPI / PM: Make messages in acpi_device_set_power() print device names
  ACPI / PM: Only set power states of devices that are power manageable

Merge branch 'pm-sleep-next' into linux-next

* pm-sleep-next:
  PM / Sleep: new trace event to print device suspend and resume times
  PM / Sleep: increase ftrace coverage in suspend/resume