David S. Miller 04f58c8854 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: Documentation/devicetree/bindings/net/micrel-ks8851.txt net/core/netpoll.c The net/core/netpoll.c conflict is a bug fix in 'net' happening to code which is completely removed in 'net-next'. In micrel-ks8851.txt we simply have overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-25 20:29:20 -04:00
..
boot	ARM: SoC fixes for 3.14	2014-03-22 09:13:13 -07:00
common	ARM: SoC platform changes for 3.14	2014-01-23 18:40:49 -08:00
configs	ARM: tegra: add LED options back into tegra_defconfig	2014-02-28 21:35:58 +01:00
crypto	CRYPTO: Fix more AES build errors	2014-01-05 13:59:56 +00:00
firmware	ARM: add basic support for Trusted Foundations	2013-12-13 12:50:30 -07:00
include	ARM: fix noMMU kallsyms symbol filtering	2014-03-07 22:04:06 +00:00
kernel	ARM: 7980/1: kernel: improve error message when LPAE config doesn't match CPU	2014-02-21 11:56:32 +00:00
kvm	arm/arm64: KVM: detect CPU reset on CPU_PM_EXIT	2014-02-27 19:27:10 +01:00
lib	ARM: 7877/1: use built-in byte swap function	2013-12-29 12:32:45 +00:00
mach-at91	ARM: SoC platform changes for 3.14	2014-01-23 18:40:49 -08: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	ARM: add initial support for Marvell Berlin SoCs	2013-12-13 16:31:07 +01:00
mach-clps711x	ARM: SoC platform changes for 3.14	2014-01-23 18:40:49 -08:00
mach-cns3xxx
mach-davinci	ARM: driver updates for 3.14	2014-01-23 18:49:36 -08:00
mach-dove
mach-ebsa110
mach-efm32	ARM: new platform for Energy Micro's EFM32 Cortex-M3 SoCs	2013-12-16 17:51:33 +01:00
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	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: build pm-imx6q.c independently of CONFIG_PM	2014-02-18 16:03:43 -08:00
mach-integrator	ARM: integrator: restore static map on the CP	2014-01-31 14:58:52 -08: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: keystone: config: fix build warning when CONFIG_DMADEVICES is not set	2014-01-31 15:03:53 -08:00
mach-kirkwood	mvebu fixes for v3.13 (incremental #2)	2014-01-31 14:59:28 -08: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: moxart: move DMA_OF selection to driver	2014-02-02 19:52:45 -08:00
mach-msm	ARM: driver updates for 3.14	2014-01-23 18:49:36 -08:00
mach-mv78xx0
mach-mvebu	mvebu fixes for v3.13 (incremental #2)	2014-01-31 14:59:28 -08:00
mach-mxs
mach-netx
mach-nomadik
mach-nspire
mach-omap1	ARM: OMAP1: nokia770: enable tahvo-usb	2014-02-13 15:20:14 -08:00
mach-omap2	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00
mach-orion5x
mach-picoxcell
mach-prima2	ARM: clean up cache handling in platform code	2013-12-11 16:24:34 -08:00
mach-pxa	Merge tag 'pwm_pxa_for_v3.14' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux into fixes	2014-02-18 15:32:21 -08:00
mach-realview
mach-rockchip
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	ARM: 7991/1: sa1100: fix compile problem on Collie	2014-03-07 22:04:08 +00:00
mach-shmobile	ARM: fix HAVE_ARM_TWD selection for OMAP and shmobile	2014-02-02 19:52:53 -08:00
mach-socfpga
mach-spear
mach-sti	ARM: clean up cache handling in platform code	2013-12-11 16:24:34 -08:00
mach-sunxi	ARM: SoC platform changes for 3.14	2014-01-23 18:40:49 -08:00
mach-tegra	ARM: SoC fixes for 3.14-rc	2014-02-23 17:38:04 -08:00
mach-u300	ARM: SoC platform changes for 3.14	2014-01-23 18:40:49 -08:00
mach-ux500	ARM: SoC DT updates for 3.14	2014-01-23 18:45:38 -08:00
mach-versatile	ARM: versatile: move GPIO2 and GPIO3 to core	2013-12-20 18:22:47 +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	Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2014-03-07 17:39:32 -08:00
net	bpf: do not use reciprocal divide	2014-01-15 17:02:08 -08:00
nwfpe
oprofile
plat-iop
plat-omap	Merge branch 'efm32/soc' into next/soc	2013-12-20 08:59:30 -08:00
plat-orion	mvebu fixes for v3.13 (incremental #2)	2014-01-31 14:59:28 -08:00
plat-pxa	ARM: pxa: remove IRQF_DISABLED	2013-12-11 17:32:41 -08:00
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 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2014-03-07 17:39:32 -08:00
Kconfig-nommu
Kconfig.debug	ARM: SoC platform changes for 3.14	2014-01-23 18:40:49 -08:00
Makefile	Merge branches 'fixes' and 'misc' into for-linus	2014-01-28 21:38:48 +00:00