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
chip.c
genirq: Remove irq argument from irq flow handlers
2015-09-16 15:47:51 +02:00
debug.h
devres.c
dummychip.c
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
Makefile
manage.c
irq: Export per-cpu irq allocation and de-allocation functions
2015-09-29 11:51:40 -07:00
migration.c
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
spurious.c
genirq: Remove the irq argument from note_interrupt()
2015-07-11 23:14:25 +02:00