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

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

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

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

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

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

Merge remote-tracking branch 'crypto/master'

Conflicts:
crypto/crypto_user.c
drivers/char/hw_random/Kconfig
drivers/crypto/bfin_crc.h
drivers/crypto/caam/error.c

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

Merge remote-tracking branch 'bluetooth/master'

Conflicts:
drivers/bluetooth/btusb.c

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

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

next-20140516/net-next

Conflicts:
drivers/net/ethernet/altera/altera_msgdma.c
drivers/net/ethernet/altera/altera_sgdma.c
net/ipv6/xfrm6_output.c

Merge remote-tracking branch 'dmaengine/next'

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

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

Merge remote-tracking branch 'thermal/next'

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

Conflicts:
arch/mips/loongson/lemote-2f/clock.c
drivers/cpufreq/exynos-cpufreq.c
drivers/cpufreq/exynos-cpufreq.h

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'

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

Conflicts:
fs/cifs/cifsfs.c
fs/f2fs/file.c

Merge remote-tracking branch 'file-private-locks/linux-next'

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

Merge remote-tracking branch 'ubifs/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 'uml/next'

Conflicts:
arch/um/include/asm/Kbuild

Merge remote-tracking branch 'tile/master'

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

Conflicts:
arch/sparc/include/asm/pgtable_64.h

Merge remote-tracking branch 's390/features'

Merge remote-tracking branch 'fsl/next'

Merge remote-tracking branch 'powerpc/next'

Conflicts:
arch/powerpc/kernel/exceptions-64s.S

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

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

Merge remote-tracking branch 'arm64/for-next/core'

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

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

Merge remote-tracking branch 'renesas/next'

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

Conflicts:
arch/arm/mach-mvebu/Kconfig

Merge remote-tracking branch 'keystone/next'

Merge remote-tracking branch 'imx-mxs/for-next'

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

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

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

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

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

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

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

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

Merge remote-tracking branch 'devicetree-current/devicetree/merge'

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

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

Merge remote-tracking branch 'wireless/master'

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

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

next-20140519/net

Merge remote-tracking branch 'sparc/master'

Merge remote-tracking branch 'powerpc-merge/merge'

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

Merge remote-tracking branch 'fixes/master'

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

* acpi-processor-next:
  ACPI / processor: Fix STARTING/DYING action in acpi_cpu_soft_notify()
  ACPI / processor: Check if LAPIC is present during initialization
  ACPI / ia64: introduce variable acpi_lapic into ia64

Merge branch 'pm-opp' into linux-next

* pm-opp:
  PM / OPP: Make OPP invisible to users in Kconfig
  PM / OPP: fix incorrect OPP count handling in of_init_opp_table

Merge branch 'acpi-tables' into linux-next

* acpi-tables:
  ACPI: Fix conflict between customized DSDT and DSDT local copy

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

* pm-cpufreq-next:
  cpufreq: Tegra: drop wrapper around tegra_update_cpu_speed()
  cpufreq: imx6q: Remove unused include
  cpufreq: imx6q: Drop devm_clk/regulator_get usage
  cpufreq: powernow-k8: Suppress checkpatch warnings
  cpufreq: powernv: make local function static
  cpufreq: Enable big.LITTLE cpufreq driver on arm64
  cpufreq: nforce2: remove DEFINE_PCI_DEVICE_TABLE macro

Merge branch 'pm-tools' into linux-next

* pm-tools:
  cpupower: Remove mc and smt power aware scheduler info/settings
  cpupower: cpupower info -b should return 0 on success, not the perf bias value
  cpupower: If root, try to load msr driver on x86 if /dev/cpu/0/msr is not available
  cpupower: Install recently added cpupower-idle-{set, info} manpages
  cpupower: Introduce idle state disable-by-latency and enable-all
  cpupower: Remove all manpages on make uninstall
  cpupower: Remove dead link to homepage, and update the targets built.
  cpupower: Rename cpufrequtils -> cpupower, and libcpufreq -> libcpupower.

Merge branch 'pm-sleep' into linux-next

* pm-sleep:
  ACPI / PM: Avoid resuming devices in ACPI PM domain during system suspend
  PM / sleep: Update device PM documentation to cover direct_complete
  PM / sleep: Mechanism to avoid resuming runtime-suspended devices unnecessarily
  PM / hibernate: Fix memory corruption in resumedelay_setup()

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

* acpi-video-next:
  ACPI / video: Don't register acpi_video_resume notifier without backlight devices

Merge branch 'acpi-platform' into linux-next

* acpi-platform:
  ACPI / platform: add IDs for Broadcom Bluetooth and GPS chips

Merge branch 'acpi-battery' into linux-next

* acpi-battery:
  ACPI / battery: Accelerate battery resume callback

Merge branch 'acpica-next' into linux-next

* acpica-next:
  ACPICA: Clean up redudant definitions already defined elsewhere
  ACPICA: Linux headers: Add <asm/acenv.h> to remove mis-ordered inclusion of <asm/acpi.h>
  ACPICA: Linux headers: Add <acpi/platform/aclinuxex.h>
  ACPICA: Linux headers: Remove ACPI_PREEMPTION_POINT() due to no usages.

Merge branch 'pm-runtime' into linux-next

* pm-runtime:
  PM / runtime: Update documentation to reflect the current code flow

Merge branch 'pm-cpuidle' into linux-next

* pm-cpuidle:
  ARM: clps711x: Add cpuidle driver

Merge branch 'acpi-pm' into linux-next

* acpi-pm:
  ACPI / PM: Hold ACPI scan lock over the "freeze" sleep state

Merge branch 'berlin/soc' into berlin/for-next

PM / OPP: Make OPP invisible to users in Kconfig

The OPP code is an in kernel library selected by its users, there is no
no architecture code required to implement it and enabling it without a
user just increases the kernel size. Since the users select rather than
depend on it just remove the ability to directly set the option from
Kconfig.

Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Nishanth Menon <nm@ti.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

PM / OPP: fix incorrect OPP count handling in of_init_opp_table

In of_init_opp_table function, if a failure to add an OPP is
detected, the count of OPPs, yet to be added is not updated.
Fix this by decrementing this count on failure as well.

Signed-off-by: Chander Kashyap <k.chander@samsung.com>
Signed-off-by: Inderpal Singh <inderpal.s@samsung.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Cc: 3.7+ <stable@vger.kernel.org> # 3.7+
Acked-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

ARM: dts: berlin: enable SD card reader and eMMC for the BG2Q DMP

Enable the SD Card reader and the internal eMMC on the Berlin BG2Q DMP
using two of the SDHCI nodes of the Berlin BG2Q.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

ARM: dts: berlin: add the SDHCI nodes for the BG2Q

Add the SDHCI nodes for the Marvell Berlin BG2Q, using the mrvl,pxav3-mmc
driver.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

ARM: dts: berlin: add the pinctrl node and muxing setup for uarts

Add pinctrl bindings and system control nodes to what we currently know
about Berlin SoCs. Where available, also set default pinctrl property
for uarts, when there is only one pinmux option for it.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

dt-binding: ARM: add pinctrl binding docs for Marvell Berlin2 SoCs

Add pin control binding documentation to the SoC binding documentaion
as pinctrl is part of chip/system control registers. The documentation
also explains how to configure this group based controller.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

ARM: dts: berlin: convert BG2Q to DT clock nodes

This converts Berlin BG2Q SoC dtsi to make use of the new DT clock
nodes for Berlin SoCs.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

ARM: dts: berlin: convert BG2 to DT clock nodes

This converts Berlin BG2 SoC dtsi to make use of the new DT clock
nodes for Berlin SoCs. While at it, also fix up twdclk which is
running at cpuclk/3 instead of sysclk.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

ARM: dts: berlin: convert BG2CD to DT clock nodes

This converts Berlin BG2CD SoC dtsi to make use of the new DT clock
nodes for Berlin SoCs. Also add a binding include to ease core clock
references.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

clk: berlin: add binding include for Berlin SoC clock ids

This adds a dt-binding include for Marvell Berlin BG2/BG2CD and BG2Q
core clock IDs.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

dt-binding: ARM: add clock binding docs for Marvell Berlin2 SoCs

This adds mandatory device tree binding documentation for the clock related
IP found on Marvell Berlin2 (BG2, BG2CD, and BG2Q) SoCs to the Berlin SoC
binding documentation.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

ARM: dts: berlin: add the BG2CD GPIO nodes

The Berlin BG2CD has 32 GPIOs in SoC power domain and 16 in the SM one.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>