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

Conflicts:
drivers/vhost/test.c

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

Merge remote-tracking branch 'bcon/master'

Conflicts:
drivers/block/Kconfig

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

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

Conflicts:
drivers/staging/nvec/nvec_kbd.c

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

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

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

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

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

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

Conflicts:
arch/arm/include/asm/kvm_host.h
arch/arm/kvm/arm.c

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

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

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

Merge remote-tracking branch 'selinux/master'

Merge remote-tracking branch 'security/next'

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

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

Merge remote-tracking branch 'battery/master'

Merge remote-tracking branch 'mfd/master'

Conflicts:
drivers/mfd/intel_msic.c

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

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

Merge branch 'device-mapper/master'

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

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

Merge remote-tracking branch 'input-mt/for-next'

Merge remote-tracking branch 'input/next'

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

Merge remote-tracking branch 'modules/modules-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_reg.h
drivers/gpu/drm/i915/intel_dp.c

20130520/crypto

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

Merge remote-tracking branch 'bluetooth/master'

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

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

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

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

Merge remote-tracking branch 'thermal/next'

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

Conflicts:
drivers/acpi/processor_driver.c
drivers/base/power/qos.c

Merge remote-tracking branch 'idle/next'

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

Merge remote-tracking branch 'infiniband/for-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 remote-tracking branch 'i2c/i2c/for-next'

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

Merge remote-tracking branch 'xfs/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 'fuse/for-next'

Merge remote-tracking branch 'f2fs/dev'

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

Merge remote-tracking branch 'ceph/testing'

Merge remote-tracking branch 'xtensa/for_next'

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

Conflicts:
arch/sh/kernel/cpu/sh2a/Makefile

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 'cris/for-next'

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

Conflicts:
arch/arm/mach-highbank/highbank.c
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-spear/spear13xx.c
arch/arm/mach-vexpress/v2m.c
arch/arm/mach-zynq/platsmp.c
drivers/clocksource/Makefile
drivers/clocksource/tegra20_timer.c

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

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

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

Merge remote-tracking branch 'mfd-fixes/master'

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

Merge remote-tracking branch 'ide/master'

Merge remote-tracking branch 'crypto-current/master'

Merge remote-tracking branch 'input-current/for-linus'

Merge remote-tracking branch 'char-misc.current/char-misc-linus'

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

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

Conflicts:
drivers/usb/host/ohci-nxp.c

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

Merge remote-tracking branch 'pci-current/for-linus'

Merge remote-tracking branch 'net/master'

Merge remote-tracking branch 'arc-current/for-curr'

Merge remote-tracking branch 'regulator/topic/lp872x' into regulator-next

Merge remote-tracking branch 'regulator/topic/isl6271a' into regulator-next

Merge remote-tracking branch 'regulator/topic/drvdata' into regulator-next

Merge remote-tracking branch 'regulator/topic/delay' into regulator-next

Merge remote-tracking branch 'regulator/topic/abb' into regulator-next

Merge remote-tracking branch 'regulator/fix/palmas' into regulator-linus

Merge remote-tracking branch 'regulator/fix/doc' into regulator-linus

Merge remote-tracking branch 'regulator/fix/dbx500' into regulator-linus

regulator: lp872x: support the device tree feature

This patch enables the DT structure of the LP8720 and LP8725 device.
The LP872x platform data is generated when the device tree is configured.
Even if the platform data is NULL, it is no issue at all because the driver is
configured with the default mode.

Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

Merge remote-tracking branch 'asoc/topic/x86' into asoc-next

Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next

Merge remote-tracking branch 'asoc/topic/tegra' into asoc-next

Merge remote-tracking branch 'asoc/topic/spear' into asoc-next

Merge remote-tracking branch 'asoc/topic/spdif' into asoc-next

Merge remote-tracking branch 'asoc/topic/sn95031' into asoc-next

Merge remote-tracking branch 'asoc/topic/sgtl5000' into asoc-next

Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next