Arnd Bergmann 54cab10f63 Merge branch 'mvebu/soc3' into next/dt ... The dts Makefile has a bunch of nasty conflicts, attempt to resolve these now to avoid trouble later. Conflicts: arch/arm/boot/dts/Makefile Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2014-03-17 12:13:09 +01:00
..
boot	Merge branch 'mvebu/soc3' into next/dt	2014-03-17 12:13:09 +01:00
common	ARM: SoC platform changes for 3.14	2014-01-23 18:40:49 -08:00
configs	ARM: multi_v7_defconfig: Select CONFIG_SOC_DRA7XX	2014-02-10 10:38:06 -08:00
crypto	CRYPTO: Fix more AES build errors	2014-01-05 13:59:56 +00:00
firmware
include	Merge branch 'mvebu/soc3' into next/dt	2014-03-17 12:13:09 +01: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	This cleanup series gets rid of <mach/timex.h> for platforms not using	2014-02-24 10:06:56 +01:00
mach-bcm	ARM: pinctrl: Add Broadcom Capri pinctrl driver	2014-01-16 14:25:38 +01:00
mach-bcm2835	ARM: bcm2835: Fix grammar in help message	2014-01-02 12:07:52 -08:00
mach-berlin
mach-clps711x	This cleanup series gets rid of <mach/timex.h> for platforms not using	2014-02-24 10:06:56 +01:00
mach-cns3xxx
mach-davinci	This cleanup series gets rid of <mach/timex.h> for platforms not using	2014-02-24 10:06:56 +01:00
mach-dove	Merge branch 'mvebu/soc3' into next/dt	2014-03-17 12:13:09 +01:00
mach-ebsa110
mach-efm32	ARM: efm32: drop unused file <mach/timex.h>	2014-02-24 10:07:27 +01:00
mach-ep93xx	This cleanup series gets rid of <mach/timex.h> for platforms not using	2014-02-24 10:06:56 +01:00
mach-exynos	This cleanup series gets rid of <mach/timex.h> for platforms not using	2014-02-24 10:06:56 +01:00
mach-footbridge	This cleanup series gets rid of <mach/timex.h> for platforms not using	2014-02-24 10:06:56 +01:00
mach-gemini
mach-highbank	Merge branches 'amba', 'fixes', 'kees', 'misc' and 'unstable/sa11x0' into for-next	2014-01-21 21:26:33 +00:00
mach-hisi	ARM: hisi: fix kconfig warning on HAVE_ARM_TWD	2014-02-02 19:52:42 -08:00
mach-imx	ARM: imx6: Initialize low-power mode early again	2014-02-10 10:37:32 -08:00
mach-integrator	This cleanup series gets rid of <mach/timex.h> for platforms not using	2014-02-24 10:06:56 +01:00
mach-iop13xx
mach-iop32x	This cleanup series gets rid of <mach/timex.h> for platforms not using	2014-02-24 10:06:56 +01:00
mach-iop33x
mach-ixp4xx	This cleanup series gets rid of <mach/timex.h> for platforms not using	2014-02-24 10:06:56 +01:00
mach-keystone	ARM: dts: keystone: update for supporting K2L/K2E EVMs	2014-02-25 16:24:19 -05:00
mach-kirkwood	Merge branch 'mvebu/soc3' into next/dt	2014-03-17 12:13:09 +01:00
mach-ks8695	This cleanup series gets rid of <mach/timex.h> for platforms not using	2014-02-24 10:06:56 +01:00
mach-lpc32xx	This cleanup series gets rid of <mach/timex.h> for platforms not using	2014-02-24 10:06:56 +01:00
mach-mmp	This cleanup series gets rid of <mach/timex.h> for platforms not using	2014-02-24 10:06:56 +01:00
mach-moxart	ARM: moxart: move DMA_OF selection to driver	2014-02-02 19:52:45 -08:00
mach-msm	Merge branch 'efm32/cleanup' into next/dt	2014-03-17 10:14:20 +01:00
mach-mv78xx0	Merge branch 'mvebu/soc3' into next/dt	2014-03-17 12:13:09 +01:00
mach-mvebu	ARM: mvebu: move DT Dove to MVEBU	2014-03-04 04:13:48 +00:00
mach-mxs	ARM: mxs: Add support for the eukrea-cpuimx28.	2014-02-09 21:33:20 +08:00
mach-netx
mach-nomadik
mach-nspire
mach-omap1	This cleanup series gets rid of <mach/timex.h> for platforms not using	2014-02-24 10:06:56 +01:00
mach-omap2	Merge branch 'efm32/cleanup' into next/dt	2014-03-17 10:14:20 +01:00
mach-orion5x	This cleanup series gets rid of <mach/timex.h> for platforms not using	2014-02-24 10:06:56 +01:00
mach-picoxcell
mach-prima2
mach-pxa	Merge branch 'efm32/cleanup' into next/dt	2014-03-17 10:14:20 +01:00
mach-qcom	ARM: qcom: Rename various msm prefixed functions to qcom	2014-02-06 16:20:41 -06:00
mach-realview
mach-rockchip
mach-rpc
mach-s3c24xx	This cleanup series gets rid of <mach/timex.h> for platforms not using	2014-02-24 10:06:56 +01:00
mach-s3c64xx	This cleanup series gets rid of <mach/timex.h> for platforms not using	2014-02-24 10:06:56 +01:00
mach-s5p64x0
mach-s5pc100
mach-s5pv210
mach-sa1100	This cleanup series gets rid of <mach/timex.h> for platforms not using	2014-02-24 10:06:56 +01:00
mach-shmobile	Merge branch 'efm32/cleanup' into next/dt	2014-03-17 10:14:20 +01:00
mach-socfpga
mach-spear
mach-sti
mach-sunxi	ARM: SoC platform changes for 3.14	2014-01-23 18:40:49 -08:00
mach-tegra	ARM: driver updates for 3.14	2014-01-23 18:49:36 -08:00
mach-u300	ARM: SoC platform changes for 3.14	2014-01-23 18:40:49 -08:00
mach-ux500	mfd: dbx500/abx500: root out hardcoded IRQ assignments	2014-03-04 08:58:11 +08:00
mach-versatile	This cleanup series gets rid of <mach/timex.h> for platforms not using	2014-02-24 10:06:56 +01:00
mach-vexpress
mach-virt
mach-vt8500
mach-w90x900
mach-zynq	ARM: zynq: Reserve not DMAable space in front of the kernel	2014-02-10 10:45:42 -08:00
mm	ARM: MM Enable building Feroceon L2 cache controller with ARCH_MVEBU	2014-02-22 21:19:53 +00:00
net	bpf: do not use reciprocal divide	2014-01-15 17:02:08 -08:00
nwfpe
oprofile
plat-iop
plat-omap	This cleanup series gets rid of <mach/timex.h> for platforms not using	2014-02-24 10:06:56 +01:00
plat-orion	ARM: orion: Move cache-feroceon-l2.h out of plat-orion	2014-02-22 20:43:15 +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 'mvebu/soc3' into next/dt	2014-03-17 12:13:09 +01:00
Kconfig-nommu
Kconfig.debug	ARM: qcom: Split Qualcomm support into legacy and multiplatform	2014-02-06 16:20:26 -06:00
Makefile	ARM: qcom: Split Qualcomm support into legacy and multiplatform	2014-02-06 16:20:26 -06:00