kernel-ark/arch/arm
Arnd Bergmann a65b5f4ccd Merge branch 'cleanup/kconfig' into next/drivers
This resolves a conflict between the new sti reset
controller driver and the Kconfig cleanup.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-18 16:25:47 +01:00
..
boot Merge branch 'sti/dt' into next/drivers 2014-03-18 16:19:50 +01:00
common ARM: SP804: make Integrator/CP timer pick clock from DT 2014-02-13 11:20:36 +01:00
configs ARM: socfpga: Update socfpga_defconfig 2014-03-02 14:58:07 -06:00
crypto
firmware
include Merge branches 'fixes' and 'misc' into for-linus 2014-01-28 21:38:48 +00:00
kernel Merge branches 'fixes' and 'misc' into for-linus 2014-01-28 21:38:48 +00:00
kvm First round of KVM updates for 3.14; PPC parts will come next week. 2014-01-22 21:40:43 -08:00
lib
mach-at91 ARM: SoC platform changes for 3.14 2014-01-23 18:40:49 -08:00
mach-bcm ARM: centralize common multi-platform kconfig options 2014-02-19 16:38:18 -06:00
mach-bcm2835 ARM: bcm2835: enable V6K instead of plain V6 2014-02-19 16:46:57 -06:00
mach-berlin ARM: select HAVE_SMP for V7 multi-platform 2014-02-19 16:43:27 -06:00
mach-clps711x ARM: SoC platform changes for 3.14 2014-01-23 18:40:49 -08:00
mach-cns3xxx ARM: cns3xxx: enable V6K instead of plain V6 2014-02-19 16:47:15 -06:00
mach-davinci ARM: davinci: aemif: get rid of davinci-nand driver dependency on aemif 2014-02-23 20:33:18 +05:30
mach-dove watchdog: orion: Make RSTOUT register a separate resource 2014-02-22 03:43:23 +00:00
mach-ebsa110
mach-efm32
mach-ep93xx
mach-exynos ACPI and power management updates for 3.14-rc1 2014-01-24 15:51:02 -08:00
mach-footbridge Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2014-01-24 17:17:30 -08:00
mach-gemini
mach-highbank ARM: select HAVE_SMP for V7 multi-platform 2014-02-19 16:43:27 -06:00
mach-hisi ARM: select HAVE_SMP for V7 multi-platform 2014-02-19 16:43:27 -06:00
mach-imx ARM: Select V6K instead of V6 by default for multi-platform 2014-02-19 16:46:32 -06:00
mach-integrator ARM: integrator: select GPIO block 2014-02-13 11:21:37 +01:00
mach-iop13xx
mach-iop32x ARM: iop32x: fix power off handling for the EM7210 board 2014-01-31 14:58:53 -08:00
mach-iop33x
mach-ixp4xx ARM: SoC platform changes for 3.14 2014-01-23 18:40:49 -08:00
mach-keystone ARM: select HAVE_SMP for V7 multi-platform 2014-02-19 16:43:27 -06:00
mach-kirkwood watchdog: orion: Make RSTOUT register a separate resource 2014-02-22 03:43:23 +00:00
mach-ks8695
mach-lpc32xx
mach-mmp ARM: SoC platform changes for 3.14 2014-01-23 18:40:49 -08:00
mach-moxart ARM: centralize common multi-platform kconfig options 2014-02-19 16:38:18 -06:00
mach-msm ARM: qcom: Split Qualcomm support into legacy and multiplatform 2014-02-06 16:20:26 -06:00
mach-mv78xx0 watchdog: orion: Make RSTOUT register a separate resource 2014-02-22 03:43:23 +00:00
mach-mvebu ARM: select HAVE_SMP for V7 multi-platform 2014-02-19 16:43:27 -06:00
mach-mxs ARM: centralize common multi-platform kconfig options 2014-02-19 16:38:18 -06:00
mach-netx
mach-nomadik ARM: centralize common multi-platform kconfig options 2014-02-19 16:38:18 -06:00
mach-nspire ARM: centralize common multi-platform kconfig options 2014-02-19 16:38:18 -06:00
mach-omap1 ARM: SoC platform changes for 3.14 2014-01-23 18:40:49 -08:00
mach-omap2 Merge branch 'cleanup/kconfig' into next/drivers 2014-03-18 16:25:47 +01:00
mach-orion5x watchdog: orion: Make RSTOUT register a separate resource 2014-02-22 03:43:23 +00:00
mach-picoxcell ARM: Select V6K instead of V6 by default for multi-platform 2014-02-19 16:46:32 -06:00
mach-prima2 ARM: select MIGHT_HAVE_CACHE_L2X0 for V6 and V7 multi-platform 2014-02-19 16:44:00 -06:00
mach-pxa ARM: pxa: fix various compilation problems 2014-02-10 10:33:04 -08:00
mach-qcom ARM: qcom: Rename various msm prefixed functions to qcom 2014-02-06 16:20:41 -06:00
mach-realview
mach-rockchip ARM: select HAVE_SMP for V7 multi-platform 2014-02-19 16:43:27 -06:00
mach-rpc
mach-s3c24xx ARM: SoC cleanups for 3.14 2014-01-23 18:36:55 -08:00
mach-s3c64xx ARM: SoC cleanups for 3.14 2014-01-23 18:36:55 -08:00
mach-s5p64x0
mach-s5pc100
mach-s5pv210
mach-sa1100 ACPI and power management updates for 3.14-rc1 2014-01-24 15:51:02 -08:00
mach-shmobile Merge branch 'cleanup/kconfig' into next/drivers 2014-03-18 16:25:47 +01:00
mach-socfpga ARM: select HAVE_SMP for V7 multi-platform 2014-02-19 16:43:27 -06:00
mach-spear ARM: select MIGHT_HAVE_CACHE_L2X0 for V6 and V7 multi-platform 2014-02-19 16:44:00 -06:00
mach-sti Merge branch 'cleanup/kconfig' into next/drivers 2014-03-18 16:25:47 +01:00
mach-sunxi ARM: select HAVE_SMP for V7 multi-platform 2014-02-19 16:43:27 -06:00
mach-tegra ARM: select MIGHT_HAVE_CACHE_L2X0 for V6 and V7 multi-platform 2014-02-19 16:44:00 -06:00
mach-u300 ARM: centralize common multi-platform kconfig options 2014-02-19 16:38:18 -06:00
mach-ux500 ARM: select MIGHT_HAVE_CACHE_L2X0 for V6 and V7 multi-platform 2014-02-19 16:44:00 -06:00
mach-versatile irqchip: support cascaded VICs 2014-02-13 11:21:21 +01:00
mach-vexpress ARM: select MIGHT_HAVE_CACHE_L2X0 for V6 and V7 multi-platform 2014-02-19 16:44:00 -06:00
mach-vt8500 ARM: vt8500: enable V6K instead of plain V6 2014-02-19 16:47:16 -06:00
mach-w90x900
mach-zynq ARM: select MIGHT_HAVE_CACHE_L2X0 for V6 and V7 multi-platform 2014-02-19 16:44:00 -06:00
mm Merge branches 'fixes' and 'misc' into for-linus 2014-01-28 21:38:48 +00:00
net
nwfpe
oprofile
plat-iop
plat-omap
plat-orion watchdog: orion: Make RSTOUT register a separate resource 2014-02-22 03:43:23 +00:00
plat-pxa
plat-samsung MTD updates for 3.14: 2014-01-28 18:56:37 -08:00
plat-versatile ARM: SoC platform changes for 3.14 2014-01-23 18:40:49 -08:00
tools
vfp
xen xen/gnttab: Use phys_addr_t to describe the grant frame base address 2014-01-30 12:56:34 +00:00
Kconfig Merge branch 'cleanup/kconfig' into next/drivers 2014-03-18 16:25:47 +01:00
Kconfig-nommu
Kconfig.debug ARM: qcom: Split Qualcomm support into legacy and multiplatform 2014-02-06 16:20:26 -06:00
Makefile Merge branch 'cleanup/kconfig' into next/drivers 2014-03-18 16:25:47 +01:00