David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/usb/asix_common.c
	net/ipv4/inet_connection_sock.c
	net/switchdev/switchdev.c

In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.

The other two conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2015-10-20 06:08:27 -07:00

..

exynos-combiner.c

irqchip: Kill off set_irq_flags usage

2015-09-16 16:53:38 +02:00

irq-armada-370-xp.c

irqchip: armada-370-xp: Rework per-cpu interrupts handling

2015-09-29 11:51:40 -07:00

irq-atmel-aic5.c

irqchip/atmel-aic5: Use per chip mask caches in mask/unmask()

2015-09-22 15:55:51 +02:00

irq-atmel-aic-common.c

irqchip: atmel-aic-common: Prevent clobbering of priority when changing IRQ type

2015-01-07 12:41:45 +00:00

irq-atmel-aic-common.h

irqchip: atmel-aic: Add irq fixup for RTT block

2014-11-09 04:36:38 +00:00

irq-atmel-aic.c

irqchip: Appropriate __init annotation for const data

2015-07-27 08:09:38 +02:00

irq-bcm2835.c

irqchip: Kill off set_irq_flags usage

2015-09-16 16:53:38 +02:00

irq-bcm2836.c

irqchip: Add bcm2836 interrupt controller for Raspberry Pi 2

2015-08-20 22:38:42 +02:00

irq-bcm7038-l1.c

genirq: Remove irq argument from irq flow handlers

2015-09-16 15:47:51 +02:00

irq-bcm7120-l2.c

genirq: Remove irq argument from irq flow handlers

2015-09-16 15:47:51 +02:00

irq-brcmstb-l2.c

genirq: Remove irq argument from irq flow handlers

2015-09-16 15:47:51 +02:00

irq-clps711x.c

irqchip: Kill off set_irq_flags usage

2015-09-16 16:53:38 +02:00

irq-crossbar.c

Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2015-09-01 14:33:35 -07:00

irq-digicolor.c

irqchip: Prepare for local stub header removal

2015-07-11 23:14:23 +02:00

irq-dw-apb-ictl.c

genirq: Remove irq argument from irq flow handlers

2015-09-16 15:47:51 +02:00

irq-gic-common.c

irqchip: gic: Simplify gic_configure_irq by using IRQCHIP_SET_TYPE_MASKED

2015-06-05 22:26:33 +02:00

irq-gic-common.h

irqchip: gic: Allow interrupt level to be set for PPIs

2015-01-26 11:38:23 +01:00

irq-gic-v2m.c

irqchip/GICv2m: Fix GICv2m build warning on 32 bits

2015-09-15 17:06:29 +02:00

irq-gic-v3-its-pci-msi.c

irqchip/gic-v3-its: Count additional LPIs for the aliased devices

2015-10-02 20:51:41 +02:00

irq-gic-v3-its-platform-msi.c

irqchip/gicv3-its: Add platform MSI support

2015-07-30 00:14:38 +02:00

irq-gic-v3-its.c

irqchip/gic-v3-its: Silence warning when its_lpi_alloc_chunks gets inlined

2015-10-02 20:51:41 +02:00

irq-gic-v3.c

irqchip: Kill off set_irq_flags usage

2015-09-16 16:53:38 +02:00

irq-gic.c

irqchip: Kill off set_irq_flags usage

2015-09-16 16:53:38 +02:00

irq-hip04.c

irqchip: Kill off set_irq_flags usage

2015-09-16 16:53:38 +02:00

irq-i8259.c

genirq: Remove irq argument from irq flow handlers

2015-09-16 15:47:51 +02:00

irq-imgpdc.c

genirq: Remove irq argument from irq flow handlers

2015-09-16 15:47:51 +02:00

irq-imx-gpcv2.c

irqchip/imx-gpcv2: IMX GPCv2 driver for wakeup sources

2015-08-24 21:49:34 +02:00

irq-ingenic.c

irqchip: Prepare for local stub header removal

2015-07-11 23:14:23 +02:00

irq-keystone.c

irqchip: Kill off set_irq_flags usage

2015-09-16 16:53:38 +02:00

irq-metag-ext.c

genirq: Remove irq argument from irq flow handlers

2015-09-16 15:47:51 +02:00

irq-metag.c

genirq: Remove irq argument from irq flow handlers

2015-09-16 15:47:51 +02:00

irq-mips-cpu.c

irqchip: Prepare for local stub header removal

2015-07-11 23:14:23 +02:00

irq-mips-gic.c

irqchip: mips-gic: Fix pending & mask reads for MIPS64 with 32b GIC.

2015-09-27 14:11:18 +02:00

irq-mmp.c

irqchip: Kill off set_irq_flags usage

2015-09-16 16:53:38 +02:00

irq-moxart.c

irqchip: Prepare for local stub header removal

2015-07-11 23:14:23 +02:00

irq-mtk-sysirq.c

irqchip: Prepare for local stub header removal

2015-07-11 23:14:23 +02:00

irq-mxs.c

irqchip: Kill off set_irq_flags usage

2015-09-16 16:53:38 +02:00

irq-nvic.c

irqchip: Prepare for local stub header removal

2015-07-11 23:14:23 +02:00

irq-omap-intc.c

irqchip: omap-intc: Improve IRQ handler

2015-07-22 18:37:42 +02:00

irq-or1k-pic.c

irqchip: Prepare for local stub header removal

2015-07-11 23:14:23 +02:00

irq-orion.c

genirq: Remove irq argument from irq flow handlers

2015-09-16 15:47:51 +02:00

irq-renesas-h8s.c

irqchip: Prepare for local stub header removal

2015-07-11 23:14:23 +02:00

irq-renesas-h8300h.c

irqchip: Prepare for local stub header removal

2015-07-11 23:14:23 +02:00

irq-renesas-intc-irqpin.c

irqchip: Kill off set_irq_flags usage

2015-09-16 16:53:38 +02:00

irq-renesas-irqc.c

irqchip/renesas-irqc: Propagate wake-up settings to parent

2015-09-15 17:06:29 +02:00

irq-s3c24xx.c

irqchip: Kill off set_irq_flags usage

2015-09-16 16:53:38 +02:00

irq-sa11x0.c

ARM: kill off set_irq_flags usage

2015-07-28 13:58:13 +02:00

irq-sirfsoc.c

irqchip: Prepare for local stub header removal

2015-07-11 23:14:23 +02:00

irq-st.c

irqchip: st: Supply new driver for STi based devices

2015-03-03 19:48:53 +00:00

irq-sun4i.c

irqchip: Kill off set_irq_flags usage

2015-09-16 16:53:38 +02:00

irq-sunxi-nmi.c

genirq: Remove irq argument from irq flow handlers

2015-09-16 15:47:51 +02:00

irq-tb10x.c

genirq: Remove irq argument from irq flow handlers

2015-09-16 15:47:51 +02:00

irq-tegra.c

irqchip: Prepare for local stub header removal

2015-07-11 23:14:23 +02:00

irq-versatile-fpga.c

irqchip: Kill off set_irq_flags usage

2015-09-16 16:53:38 +02:00

irq-vf610-mscm-ir.c

irqchip: Prepare for local stub header removal

2015-07-11 23:14:23 +02:00

irq-vic.c

irqchip: Kill off set_irq_flags usage

2015-09-16 16:53:38 +02:00

irq-vt8500.c

irqchip: Kill off set_irq_flags usage

2015-09-16 16:53:38 +02:00

irq-xtensa-mx.c

irqchip: Prepare for local stub header removal

2015-07-11 23:14:23 +02:00

irq-xtensa-pic.c

irqchip: Prepare for local stub header removal

2015-07-11 23:14:23 +02:00

irq-zevio.c

irqchip: Prepare for local stub header removal

2015-07-11 23:14:23 +02:00

irqchip.c

irqchip: Add GICv2 specific ACPI boot support

2015-03-26 15:13:07 +00:00

Kconfig

irqchip/imx-gpcv2: IMX GPCv2 driver for wakeup sources

2015-08-24 21:49:34 +02:00

Makefile

irqchip/imx-gpcv2: IMX GPCv2 driver for wakeup sources

2015-08-24 21:49:34 +02:00

spear-shirq.c

irqchip: Kill off set_irq_flags usage

2015-09-16 16:53:38 +02:00