linux/arch/arm
Arnd Bergmann 11c7a6c5a3 Merge branch 'treewide/cleanup' into next/multiplatform
The realview multiplatform series has a trivial conflict with
one of the treewide cleanups, let's just merge that in to
avoid having to resolve this later.

* treewide/cleanup:
  ARM: use "depends on" for SoC configs instead of "if" after prompt
  ARM/clocksource: use automatic DT probing for ux500 PRCMU
  ARM: use const and __initconst for smp_operations
  ARM: hisi: do not export smp_operations structures

Conflicts:
	arch/arm/mach-integrator/Kconfig
2015-12-18 17:07:52 +01:00
..
boot Allwinner fixes for 4.4 2015-12-14 16:59:40 -08:00
common ARM: use const and __initconst for smp_operations 2015-12-01 22:17:45 +01:00
configs Multiplatform support for the RealView 2015-12-18 16:42:47 +01:00
crypto
firmware
include Merge branch 'treewide/cleanup' into next/multiplatform 2015-12-18 17:07:52 +01:00
kernel Merge branch 'treewide/cleanup' into next/multiplatform 2015-12-18 17:07:52 +01:00
kvm KVM: arm/arm64: Fix preemptible timer active state crazyness 2015-11-24 18:04:00 +01:00
lib
mach-alpine ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mach-asm9260
mach-at91 Merge branch 'treewide/cleanup' into next/multiplatform 2015-12-18 17:07:52 +01:00
mach-axxia ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mach-bcm ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mach-berlin ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mach-clps711x
mach-cns3xxx ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mach-davinci ARM: davinci: make headers more local 2015-12-01 21:52:51 +01:00
mach-digicolor ARM: digicolor: select pinctrl/gpio driver 2015-10-15 22:27:30 +02:00
mach-dove ARM: dove: convert legacy dove to PMU support 2015-12-08 13:23:14 +01:00
mach-ebsa110
mach-efm32
mach-ep93xx
mach-exynos Merge branch 'treewide/cleanup' into next/multiplatform 2015-12-18 17:07:52 +01:00
mach-footbridge ARM: debug-ll: rework footbridge handling 2015-12-15 23:43:29 +01:00
mach-gemini ARM: gemini: remove unnecessary mdio-gpio includes 2015-10-21 19:50:43 -07:00
mach-highbank ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mach-hisi ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mach-imx ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mach-integrator Merge branch 'treewide/cleanup' into next/multiplatform 2015-12-18 17:07:52 +01:00
mach-iop13xx ARM: iop13xx: make headers more local 2015-12-01 21:52:51 +01:00
mach-iop32x
mach-iop33x
mach-ixp4xx ARM: ixp4xx: fix read{b,w,l} return types 2015-12-01 23:45:30 +01:00
mach-keystone ARM: use const and __initconst for smp_operations 2015-12-01 22:17:45 +01:00
mach-ks8695 ARM: ks8695: make headers more local 2015-12-01 21:52:50 +01:00
mach-lpc18xx
mach-lpc32xx
mach-mediatek ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mach-meson ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mach-mmp ARM: mmp: avoid unused functions 2015-12-01 21:44:33 +01:00
mach-moxart ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mach-mv78xx0 ARM: mv78xx0: multiplatform support 2015-12-07 18:17:41 +01:00
mach-mvebu ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mach-mxs
mach-netx ARM: netx: remove unused mach/param.h 2015-12-01 21:52:51 +01:00
mach-nomadik
mach-nspire
mach-omap1 ARM: omap1: make headers more local 2015-12-01 21:52:50 +01:00
mach-omap2 Merge branch 'treewide/cleanup' into next/multiplatform 2015-12-18 17:07:52 +01:00
mach-orion5x ARM: orion5x: multiplatform support 2015-12-07 18:17:54 +01:00
mach-picoxcell ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mach-prima2 ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mach-pxa Merge branch 'fixes' into next/multiplatform 2015-12-17 22:33:58 +01:00
mach-qcom ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mach-realview Merge branch 'treewide/cleanup' into next/multiplatform 2015-12-18 17:07:52 +01:00
mach-rockchip ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mach-rpc
mach-s3c24xx cpufreq: s3c24xx: Do not mark s3c2410_plls_add as __init 2015-11-27 10:10:32 +09:00
mach-s3c64xx ARM: s3c64xx: allow building without board support 2015-12-01 21:50:26 +01:00
mach-s5pv210 ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mach-sa1100
mach-shmobile ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mach-socfpga ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mach-spear ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mach-sti ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mach-stm32
mach-sunxi ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mach-tegra ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mach-u300 ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mach-uniphier ARM: use const and __initconst for smp_operations 2015-12-01 22:17:45 +01:00
mach-ux500 ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mach-versatile ARM: versatile: convert to multi-platform 2015-12-15 23:54:48 +01:00
mach-vexpress ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mach-vt8500
mach-w90x900 ARM: w90x900: make headers more local 2015-12-01 21:52:51 +01:00
mach-zx ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mach-zynq ARM: use "depends on" for SoC configs instead of "if" after prompt 2015-12-01 22:44:51 +01:00
mm Multiplatform support for the RealView 2015-12-18 16:42:47 +01:00
net bpf, arm: start flushing icache range from header 2015-11-16 14:40:49 -05:00
nwfpe
oprofile
plat-iop
plat-omap
plat-orion ARM: orion: always use MULTI_IRQ_HANDLER 2015-12-07 18:16:42 +01:00
plat-pxa ARM: mmp: move into ARCH_MULTIPLATFORM 2015-12-01 21:44:31 +01:00
plat-samsung ARM: s3c64xx: allow building without board support 2015-12-01 21:50:26 +01:00
plat-versatile
probes
tools
vdso ARM: 8449/1: fix bug in vdsomunge swab32 macro 2015-10-29 15:20:15 +00:00
vfp
xen mm, page_alloc: distinguish between being unable to sleep, unwilling to sleep and avoiding waking kswapd 2015-11-06 17:50:42 -08:00
Kconfig Merge branch 'treewide/cleanup' into next/multiplatform 2015-12-18 17:07:52 +01:00
Kconfig-nommu
Kconfig.debug ARM: debug-ll: move DEBUG_LL_UART_EFM32 to correct Kconfig location 2015-12-17 17:04:48 +01:00
Makefile