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
irq-armada-370-xp.c
irq-atmel-aic5.c
irq-atmel-aic-common.c
irq-atmel-aic-common.h
irq-atmel-aic.c
irq-bcm2835.c
irq-bcm2836.c
irq-bcm7038-l1.c
irq-bcm7120-l2.c
irq-brcmstb-l2.c
irq-clps711x.c
irq-crossbar.c
irq-digicolor.c
irq-dw-apb-ictl.c
irq-gic-common.c
irq-gic-common.h
irq-gic-v2m.c
irq-gic-v3-its-pci-msi.c
irq-gic-v3-its-platform-msi.c
irq-gic-v3-its.c
irq-gic-v3.c
irq-gic.c
irq-hip04.c
irq-i8259.c
irq-imgpdc.c
irq-imx-gpcv2.c
irq-ingenic.c
irq-keystone.c
irq-metag-ext.c
irq-metag.c
irq-mips-cpu.c
irq-mips-gic.c
irq-mmp.c
irq-moxart.c
irq-mtk-sysirq.c
irq-mxs.c
irq-nvic.c
irq-omap-intc.c
irq-or1k-pic.c
irq-orion.c
irq-renesas-h8s.c
irq-renesas-h8300h.c
irq-renesas-intc-irqpin.c
irq-renesas-irqc.c
irq-s3c24xx.c
irq-sa11x0.c
irq-sirfsoc.c
irq-st.c
irq-sun4i.c
irq-sunxi-nmi.c
irq-tb10x.c
irq-tegra.c
irq-versatile-fpga.c
irq-vf610-mscm-ir.c
irq-vic.c
irq-vt8500.c
irq-xtensa-mx.c
irq-xtensa-pic.c
irq-zevio.c
irqchip.c
Kconfig
Makefile
spear-shirq.c