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

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

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

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

Conflicts:
arch/s390/include/asm/pgtable.h

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

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

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

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

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

Conflicts:
Documentation/networking/netlink_mmap.txt

Merge remote-tracking branch 'watchdog/master'

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

Conflicts:
drivers/video/of_display_timing.c

Merge remote-tracking branch 'battery/master'

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 branch 'device-mapper/master'

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

Conflicts:
include/linux/cgroup.h

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

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

Conflicts:
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_fb.c
drivers/gpu/drm/i915/intel_sdvo.c

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

Conflicts:
drivers/gpu/drm/i915/intel_sdvo.c

Merge remote-tracking branch 'crypto/master'

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

Merge remote-tracking branch 'bluetooth/master'

Conflicts:
net/bluetooth/mgmt.c

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

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

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

Conflicts:
drivers/net/wireless/ath/ath9k/Kconfig
drivers/net/xen-netback/netback.c
net/batman-adv/bat_iv_ogm.c

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

Merge remote-tracking branch 'target-updates/for-next'

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

Merge remote-tracking branch 'dlm/next'

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

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

Conflicts:
drivers/acpi/pci_root.c
drivers/pci/probe.c
include/linux/aer.h

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 'jfs/jfs-next'

Merge remote-tracking branch 'gfs2/master'

Merge remote-tracking branch 'fscache/fscache'

Merge remote-tracking branch 'f2fs/dev'

Merge remote-tracking branch 'ext4/dev'

Merge remote-tracking branch 'ecryptfs/next'

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

Merge remote-tracking branch 'ceph/master'

Conflicts:
drivers/block/rbd.c

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 'mpc5xxx/next'

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

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

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

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

Merge remote-tracking branch 'ia64/next'

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

Merge remote-tracking branch 'arm64/upstream'

Conflicts:
include/uapi/linux/kvm.h

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

Conflicts:
arch/arm/kernel/suspend.c

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

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

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 'usb.current/usb-linus'

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

Merge remote-tracking branch 'driver-core.current/driver-core-linus'

Merge remote-tracking branch 'net/master'

Merge remote-tracking branch 'arm-current/fixes'

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

Merge branch '3.10-fixes' into mips-for-linux-next

MIPS: Update cavium_octeon_defconfig

The serial port changes make it advisable to enable the proper UART
drivers.

Signed-off-by: David Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Cc: Jamie Iles <jamie@jamieiles.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: linux-serial@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Patchwork: http://patchwork.linux-mips.org/patch/5508/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

MIPS: OCTEON: Remove custom serial setup code.

We will use 8250_dw instead.

Signed-off-by: David Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Cc: Jamie Iles <jamie@jamieiles.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: linux-serial@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Patchwork: http://patchwork.linux-mips.org/patch/5507/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

tty/8250_dw: Add support for OCTEON UARTS.

A few differences needed by OCTEON:

o These are DWC UARTS, but have USR at a different offset.

o OCTEON must have 64-bit wide register accesses, so we have OCTEON
  specific register accessors.

o No UCV register, so we hard code some properties.

Signed-off-by: David Daney <david.daney@cavium.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-mips@linux-mips.org
Cc: Jamie Iles <jamie@jamieiles.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: linux-serial@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Patchwork: http://patchwork.linux-mips.org/patch/5506/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

MIPS: OCTEON: Set proper UART clock in internal device trees.

Following patch to use generic 8250 drivers will need proper clock
information.  So when using the internal device tree, populate the
"clock-frequency" property with the correct value.

Signed-off-by: David Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Cc: Jamie Iles <jamie@jamieiles.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: linux-serial@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Patchwork: http://patchwork.linux-mips.org/patch/5504/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

MIPS: Delete Wind River ppmc eval board support.

This board has been EOL for many years now; lets not burden people doing
build coverage and other tree wide work with working on essentially dead
files.

[ralf@linux-mips.org: Also remove arch/mips/include/asm/mach-wrppmc/war.h.]

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: linux-mips@linux-mips.org
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Patchwork: http://patchwork.linux-mips.org/patch/5503/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

MIPS: BCM63XX: remove bogus Kconfig selects

Remove the bogus selects on USB-related symbols for 6345 and 6338, not
only we do not yet support USB on BCM63XX, but they also cause the
following warnings:

warning: (BCM63XX_CPU_6338 && BCM63XX_CPU_6345) selects
USB_OHCI_BIG_ENDIAN_MMIO which has unmet direct dependencies
(USB_SUPPORT && USB && USB_OHCI_HCD)
warning: (BCM63XX_CPU_6338 && BCM63XX_CPU_6345) selects
USB_OHCI_BIG_ENDIAN_DESC which has unmet direct dependencies
(USB_SUPPORT && USB && USB_OHCI_HCD)
make[4]: Leaving directory `/home/florian/dev/linux'

Just get rid of these bogus Kconfig selects because neither 6345 nor
6338 actually have built-in USB host controllers.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
Cc: linux-mips@linux-mips.org
Cc: cernekee@gmail.com
Cc: jogo@openwrt.org
Patchwork: http://patchwork.linux-mips.org/patch/5497/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>