David S. Miller 6e03f896b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/vxlan.c drivers/vhost/net.c include/linux/if_vlan.h net/core/dev.c The net/core/dev.c conflict was the overlap of one commit marking an existing function static whilst another was adding a new function. In the include/linux/if_vlan.h case, the type used for a local variable was changed in 'net', whereas the function got rewritten to fix a stacked vlan bug in 'net-next'. In drivers/vhost/net.c, Al Viro's iov_iter conversions in 'net-next' overlapped with an endainness fix for VHOST 1.0 in 'net'. In drivers/net/vxlan.c, vxlan_find_vni() added a 'flags' parameter in 'net-next' whereas in 'net' there was a bug fix to pass in the correct network namespace pointer in calls to this function. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-02-05 14:33:28 -08:00
..
boot	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-02-05 14:33:28 -08:00
common	Driver core patches for 3.19-rc1	2014-12-14 16:10:09 -08:00
configs	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
crypto	crypto: arm - replace memset by memzero_explicit	2014-12-02 22:55:51 +08:00
firmware
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-02-05 14:33:28 -08:00
kernel	Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2015-02-04 09:42:55 -08:00
kvm	arm/arm64: KVM: Use kernel mapping to perform invalidation on page fault	2015-01-29 23:24:57 +01:00
lib	ARM: 8225/1: Add unwinding support for memory copy functions	2014-11-27 16:00:25 +00:00
mach-asm9260	ARM: add mach-asm9260	2014-11-28 15:06:38 +01:00
mach-at91	ARM: at91: board-dt-sama5: add phy_fixup to override NAND_Tree	2015-01-12 15:50:23 +01:00
mach-axxia
mach-bcm	Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-12-10 08:38:57 -08:00
mach-berlin
mach-clps711x
mach-cns3xxx
mach-davinci	More ACPI and power management updates for 3.19-rc1	2014-12-18 20:28:33 -08:00
mach-dove
mach-ebsa110
mach-efm32
mach-ep93xx	arm: ep93xx: add dma_masks for the M2P and M2M DMA controllers	2014-11-28 12:34:08 +01:00
mach-exynos	More ACPI and power management updates for 3.19-rc1	2014-12-18 20:28:33 -08:00
mach-footbridge
mach-gemini
mach-highbank
mach-hisi
mach-imx	Revert "ARM: imx: add FEC sleep mode callback function"	2015-01-08 20:05:19 -08:00
mach-integrator
mach-iop13xx	PCI/MSI: Rename mask/unmask_msi_irq treewide	2014-11-23 13:01:45 +01:00
mach-iop32x
mach-iop33x
mach-ixp4xx
mach-keystone	ARM / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM	2014-12-13 00:42:49 +01:00
mach-ks8695
mach-lpc32xx
mach-mediatek	ARM: SoC DT updates for 3.19	2014-12-09 14:57:37 -08:00
mach-meson
mach-mmp	Please consider pulling the clk framework changes toward 3.19. It is	2014-12-20 16:42:36 -08:00
mach-moxart
mach-msm
mach-mv78xx0
mach-mvebu	ARM: mvebu: don't set the PL310 in I/O coherency mode when I/O coherency is disabled	2015-01-28 11:23:56 -06:00
mach-mxs
mach-netx
mach-nomadik
mach-nspire
mach-omap1	ARM / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM	2014-12-13 00:42:49 +01:00
mach-omap2	ARM: OMAP: Work around hardcoded interrupts	2015-01-17 08:56:12 -08:00
mach-orion5x
mach-picoxcell
mach-prima2
mach-pxa	Driver core patches for 3.19-rc1	2014-12-14 16:10:09 -08:00
mach-qcom
mach-realview
mach-rockchip	ARM: rockchip: disable jtag/sdmmc autoswitching on rk3288	2015-01-16 19:10:39 -08:00
mach-rpc
mach-s3c24xx	Driver core patches for 3.19-rc1	2014-12-14 16:10:09 -08:00
mach-s3c64xx
mach-s5pv210
mach-sa1100	arm: sa1100: move irda header to linux/platform_data	2014-12-30 18:44:07 -05:00
mach-shmobile	Third Round of Renesas ARM Based SoC Fixes for v3.19	2015-02-01 08:51:12 -08:00
mach-socfpga
mach-spear
mach-sti
mach-sunxi
mach-tegra	ACPI and power management updates for 3.19-rc1	2014-12-10 21:17:00 -08:00
mach-u300	Driver core patches for 3.19-rc1	2014-12-14 16:10:09 -08:00
mach-ux500
mach-versatile
mach-vexpress	ARM: vexpress: Enable regulator framework when MMCI is in use	2014-11-28 21:57:07 +01:00
mach-vt8500
mach-w90x900
mach-zynq	ARM: zynq: Remove secondary_startup() declaration from header	2014-12-01 09:32:22 +01:00
mm	Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2015-02-04 09:42:55 -08:00
net
nwfpe
oprofile
plat-iop
plat-omap
plat-orion	ACPI and power management updates for 3.19-rc1	2014-12-10 21:17:00 -08:00
plat-pxa
plat-samsung	Driver core patches for 3.19-rc1	2014-12-14 16:10:09 -08:00
plat-versatile	ARM: vexpress: Remove non-DT code	2014-11-28 16:08:16 +01:00
tools
vfp
xen	xen/arm: introduce GNTTABOP_cache_flush	2014-12-04 12:41:54 +00:00
Kconfig	Merge branch 'akpm' (second patch-bomb from Andrew)	2014-12-13 13:00:36 -08:00
Kconfig-nommu
Kconfig.debug	Char/Misc driver patches for 3.19-rc1	2014-12-14 16:43:47 -08:00
Makefile