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
..
autoprobe.c	genirq: Handle pending irqs in irq_startup()	2012-02-15 11:56:59 +01:00
chip.c	genirq: Remove irq argument from irq flow handlers	2015-09-16 15:47:51 +02:00
debug.h	irq: hide debug macros so they don't collide with others.	2012-04-23 12:30:03 -04:00
devres.c	genirq: devres: Fix testing return value of request_any_context_irq()	2015-05-13 10:47:37 +02:00
dummychip.c	Merge branch 'linus' into irq/core	2015-06-05 22:25:01 +02:00
generic-chip.c	genirq: Add chip_[suspend|resume] PM support to irq_chip	2015-07-27 08:09:38 +02:00
handle.c	genirq: Fix handle_bad_irq kerneldoc comment	2015-10-09 17:17:30 +02:00
internals.h	genirq: Move field 'node' from irq_data into irq_common_data	2015-09-16 15:46:49 +02:00
irqdesc.c	genirq: Remove irq argument from irq flow handlers	2015-09-16 15:47:51 +02:00
irqdomain.c	genirq: Move field 'node' from irq_data into irq_common_data	2015-09-16 15:46:49 +02:00
Kconfig	genirq: Add generic msi irq domain support	2014-11-23 13:01:47 +01:00
Makefile	genirq: Add generic msi irq domain support	2014-11-23 13:01:47 +01:00
manage.c	irq: Export per-cpu irq allocation and de-allocation functions	2015-09-29 11:51:40 -07:00
migration.c	genirq: Remove bogus restriction in irq_move_mask_irq()	2015-06-20 19:05:14 +02:00
msi.c	genirq/msi: Do not use pci_msi_[un]mask_irq as default methods	2015-10-16 12:40:43 +02:00
pm.c	genirq: Remove irq argument from suspend/resume_irq()	2015-07-11 23:14:24 +02:00
proc.c	genirq: Fix race in register_irq_proc()	2015-10-01 12:18:13 +02:00
resend.c	genirq: Remove irq argument from irq flow handlers	2015-09-16 15:47:51 +02:00
settings.h	genirq: Prevent spurious detection for unconditionally polled interrupts	2013-11-13 16:03:02 +01:00
spurious.c	genirq: Remove the irq argument from note_interrupt()	2015-07-11 23:14:25 +02:00