David S. Miller 36583eb54d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/cadence/macb.c drivers/net/phy/phy.c include/linux/skbuff.h net/ipv4/tcp.c net/switchdev/switchdev.c Switchdev was a case of RTNH_H_{EXTERNAL --> OFFLOAD} renaming overlapping with net-next changes of various sorts. phy.c was a case of two changes, one adding a local variable to a function whilst the second was removing one. tcp.c overlapped a deadlock fix with the addition of new tcp_info statistic values. macb.c involved the addition of two zyncq device entries. skbuff.h involved adding back ipv4_daddr to nf_bridge_info whilst net-next changes put two other existing members of that struct into a union. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-05-23 01:22:35 -04:00
..
boot	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-05-22 15:44:50 -07:00
common	ARM: SoC platform updates for v4.1	2015-04-22 09:08:39 -07:00
configs	ARM: multi_v7_defconfig: Select more FSL SoCs	2015-05-07 18:31:00 +02:00
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2015-04-15 10:42:15 -07:00
firmware	…
include	Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2015-05-10 11:16:48 -07:00
kernel	ARM: 8352/1: perf: Fix the pmu node name in warning message	2015-05-03 23:23:44 +01:00
kvm	This mostly includes the PPC changes for 4.1, which this time cover	2015-04-26 13:06:22 -07:00
lib	ARM: ensure delay timer has sufficient accuracy for delays	2015-04-14 22:28:07 +01:00
mach-alpine	ARM: alpine: add support for generic pci	2015-04-14 01:15:57 +02:00
mach-asm9260	…
mach-at91	Fourth batch of cleanup for 4.1:	2015-04-14 01:50:21 +02:00
mach-axxia	…
mach-bcm	ARM: cygnus: fix const declaration bcm_cygnus_dt_compat	2015-03-24 15:13:23 -07:00
mach-berlin	…
mach-clps711x	…
mach-cns3xxx	…
mach-davinci	ARM: DT updates for v4.1	2015-04-22 09:09:46 -07:00
mach-digicolor	…
mach-dove	PCI: Cleanup control flow	2015-03-19 10:17:22 -05:00
mach-ebsa110	…
mach-efm32	…
mach-ep93xx	…
mach-exynos	ARM: EXYNOS: Use of_machine_is_compatible instead of soc_is_exynos4	2015-05-14 11:43:59 +09:00
mach-footbridge	…
mach-gemini	ARM: gemini: fix compiler warning due wrong data type	2015-05-12 16:45:23 +02:00
mach-highbank	…
mach-hisi	…
mach-imx	ARM: mach-imx: devices: platform-sdhci-esdhc-imx: fix broken email address	2015-04-27 20:37:06 +08:00
mach-integrator	…
mach-iop13xx	…
mach-iop32x	…
mach-iop33x	…
mach-ixp4xx	…
mach-keystone	…
mach-ks8695	…
mach-lpc32xx	…
mach-mediatek	…
mach-meson	…
mach-mmp	…
mach-moxart	…
mach-mv78xx0	PCI: Cleanup control flow	2015-03-19 10:17:22 -05:00
mach-mvebu	ARM: SoC platform updates for v4.1	2015-04-22 09:08:39 -07:00
mach-mxs	…
mach-netx	…
mach-nomadik	…
mach-nspire	…
mach-omap1	ARM: OMAP1: PM: fix some build warnings on 1510-only Kconfigs	2015-03-16 16:09:23 -07:00
mach-omap2	ARM: OMAP2+: first set of hwmod fixes for v4.1-rc	2015-05-11 13:23:19 -07:00
mach-orion5x	PCI: Cleanup control flow	2015-03-19 10:17:22 -05:00
mach-picoxcell	…
mach-prima2	…
mach-pxa	ARM: pxa: lubbock: use new pxa_cplds driver	2015-04-30 22:52:51 +02:00
mach-qcom	…
mach-realview	…
mach-rockchip	Revert "ARM: rockchip: fix undefined instruction of reset_ctrl_regs"	2015-05-13 15:47:03 +02:00
mach-rpc	…
mach-s3c24xx	…
mach-s3c64xx	ARM: SoC platform updates for v4.1	2015-04-22 09:08:39 -07:00
mach-s5pv210	ARM: 8326/1: s5pv210: move resume code to .text section	2015-03-29 23:11:58 +01:00
mach-sa1100	…
mach-shmobile	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2015-04-24 09:49:37 -07:00
mach-socfpga	…
mach-spear	…
mach-sti	…
mach-sunxi	…
mach-tegra	Power management and ACPI updates for v4.1-rc1	2015-04-14 20:21:54 -07:00
mach-u300	…
mach-ux500	…
mach-versatile	…
mach-vexpress	ARM: SoC driver updates for v4.1	2015-04-22 09:18:17 -07:00
mach-vt8500	…
mach-w90x900	…
mach-zynq	…
mm	ARM: 8350/1: proc-feroceon: Fix feroceon_proc_info macro	2015-05-03 23:23:09 +01:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-05-13 14:31:43 -04:00
nwfpe	ARM: 8322/1: keep .text and .fixup regions closer together	2015-03-29 23:11:56 +01:00
oprofile	…
plat-iop	…
plat-omap	ARM, clocksource/drivers: Provide read_boot_clock64() and read_persistent_clock64() and use them	2015-04-03 08:18:23 +02:00
plat-orion	…
plat-pxa	ARM: plat-pxa: remove use of seq_printf return value	2015-04-15 16:35:25 -07:00
plat-samsung	…
plat-versatile	…
probes	…
tools	…
vdso	ARM: 8344/1: VDSO: honor CONFIG_VDSO in Makefile	2015-04-21 15:28:02 +01:00
vfp	…
xen	xen/arm: Define xen_arch_suspend()	2015-05-18 13:38:09 +01:00
Kconfig	ARM: SoC multiplatform code changes for v4.1	2015-04-22 09:20:15 -07:00
Kconfig-nommu	…
Kconfig.debug	ARM: SoC multiplatform code changes for v4.1	2015-04-22 09:20:15 -07:00
Makefile	ARM: SoC platform updates for v4.1	2015-04-22 09:08:39 -07:00