Merge remote-tracking branch 'samsung/for-next' Conflicts: arch/arm/mach-exynos/mach-exynos4-dt.c
Merge remote-tracking branch 'arm-soc/for-next' Conflicts: MAINTAINERS arch/arm/boot/dts/omap3-evm.dts arch/arm/mach-tegra/Kconfig arch/arm/mach-ux500/board-mop500.c
Merge remote-tracking branch 'gpio/for-next'
Merge remote-tracking branch 'tip/auto-latest' Conflicts: arch/h8300/include/asm/Kbuild include/linux/wait.h tools/perf/config/Makefile tools/perf/config/feature-tests.mak
Merge remote-tracking branch 'c6x/for-linux-next' Conflicts: arch/arm/Kconfig
Merge branches 'fixes', 'misc', 'mmci', 'unstable/dma-for-next' and 'sa11x0' into for-next
arm: select ARCH_MIGHT_HAVE_PC_PARPORT Architectures which support CONFIG_PARPORT_PC should select ARCH_MIGHT_HAVE_PC_PARPORT. Signed-off-by: Mark Salter <msalter@redhat.com> CC: Russell King <linux@arm.linux.org.uk> CC: linux-arm-kernel@lists.infradead.org
Merge branch 'v3.13-next/samsung' into for-next Conflicts: arch/arm/Kconfig
ARM: S3C64XX: Select CPU_V6K instead of CPU_V6 All S3C64XX SoCs come with ARM1176JZF-s core, which fully supports ARMv6K extensions. This patch lets the kernel use them on S3C6410 by adding selection of CPU_V6K to ARCH_S3C64XX. Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Merge branch 'for-rmk/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into unstable/devel-testing The most noticeable change is adding user unwinding support, which relies on libunwind in the perf tool for ARM, but there is also a group validation cleanup following on from fixes made in 3.11.
Merge branch 'next/soc' into for-next * next/soc: ARM: integrator: core module registers from compatible strings ARM: integrator: use devm_ioremap() to remap CM cpufreq: probe the Integrator cpufreq driver from DT ARM: integrator: move CM base into device tree ARM: integrator: decommission the <mach/irqs.h> header ARM: integrator: delete non-devicetree boot path ARM: integrator: print the Linux IRQ in LL_DEBUG code ARM: integrator: get the LM interrupts from DT ARM: integrator: update defconfig ARM: integrator: get the CM control register by proxy Signed-off-by: Kevin Hilman <khilman@linaro.org>
Merge tag 'integrator-for-v3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/soc From Linus Walleij: Integrator patches for the v3.13 kernel cycle: - Fix up the LED support - Update the Integrator defconfig - Remove ATAG boot path - Move some stuff over to the device tree * tag 'integrator-for-v3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator: ARM: integrator: core module registers from compatible strings ARM: integrator: use devm_ioremap() to remap CM cpufreq: probe the Integrator cpufreq driver from DT ARM: integrator: move CM base into device tree ARM: integrator: decommission the <mach/irqs.h> header ARM: integrator: delete non-devicetree boot path ARM: integrator: print the Linux IRQ in LL_DEBUG code ARM: integrator: get the LM interrupts from DT ARM: integrator: update defconfig ARM: integrator: get the CM control register by proxy Signed-off-by: Kevin Hilman <khilman@linaro.org>
ARM: integrator: delete non-devicetree boot path The Device Tree boot path now supports everything the ATAG boot can provide, and the two are equivalent. This deletes the ATAG boot path from the Integrator/AP and Integrator/CP platforms to move them on to the future. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Merge tag 'v3.12-rc4' into devel Linux 3.12-rc4
ARM: 7854/1: lockref: add support for lockless lockrefs using cmpxchg64 Our spinlocks are only 32-bit (2x16-bit tickets) and, on processors with 64-bit atomic instructions, cmpxchg64 makes use of the double-word exclusive accessors. This patch wires up the cmpxchg-based lockless lockref implementation for ARM. Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Merge tag 'keystone-soc-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/soc From Santosh Shilimkar: SOC updates for Keystone II devices: - Clock tree support - Clock management support using PM core - Keystone config update for EMDA with ack from Vinod - Enable SPI and I2C drivers * tag 'keystone-soc-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: (510 commits) ARM: keystone: Enable I2C and SPI bus support ARM: keystone: Select TI_EDMA to be able to enable SPI driver dma: Allow TI_EDMA selectable for ARCH_KEYSTONE ARM: dts: keystone: Add the SPI nodes ARM: dts: keystone: Add i2c device nodes ARM: keystone: add PM domain support for clock management ARM: keystone: Enable clock drivers ARM: dts: keystone: Add clock phandle to UART nodes ARM: dts: keystone: Add clock tree data to devicetree +Linux 3.12-rc4 Signed-off-by: Kevin Hilman <khilman@linaro.org>
Merge branch 'fixes' into for-next
Merge branch 'v3.13-next/dma-s3c24xx' into for-next
Merge branch 'next/cleanup' into for-next * next/cleanup: ARM: drop explicit selection of HAVE_CLK and CLKDEV_LOOKUP Signed-off-by: Olof Johansson <olof@lixom.net>
ARM: drop explicit selection of HAVE_CLK and CLKDEV_LOOKUP CLKDEV_LOOKUP selects HAVE_CLK and COMMON_CLK selects CLKDEV_LOOKUP. So all symbols that select at least two of these symbols can be simplified. For imx, omap2 and ux500 some rearrangements were necessary before the simplification. Acked-by: Tony Lindgren <tony@atomide.com> Acked-by: Stephen Boyd <sboyd@codeaurora.org> Acked-by: Dinh Nguyen <dinguyen@altera.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Pawel Moll <pawel.moll@arm.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Olof Johansson <olof@lixom.net>