David S. Miller 6b6cbc1471 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts were simply overlapping changes. In the net/ipv4/route.c case the code had simply moved around a little bit and the same fix was made in both 'net' and 'net-next'. In the net/sched/sch_generic.c case a fix in 'net' happened at the same time that a new argument was added to qdisc_hash_add(). Signed-off-by: David S. Miller <davem@davemloft.net>		2017-04-15 21:16:30 -04:00
..
dwc	PCI: dwc: Fix dw_pcie_ops NULL pointer dereference	2017-04-04 08:24:25 -05:00
host	PCI: thunder-pem: Fix legacy firmware PEM-specific resources	2017-04-03 15:10:21 -05:00
hotplug	sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>	2017-03-02 08:42:32 +01:00
pcie	PCI/ASPM: Always set link->downstream to avoid NULL dereference on remove	2017-03-07 14:23:30 -06:00
access.c	sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>	2017-03-02 08:42:32 +01:00
ats.c
bus.c	PCI: Autosense device removal in pci_bridge_d3_update()	2016-11-17 18:44:56 -06:00
ecam.c	PCI: Add MCFG quirks for Qualcomm QDF2432 host controller	2016-12-06 13:45:49 -06:00
host-bridge.c
hotplug-pci.c
htirq.c
iov.c	PCI: Lock each enable/disable num_vfs operation in sysfs	2017-02-03 13:42:38 -06:00
irq.c
Kconfig	PCI: Move DesignWare IP support to new drivers/pci/dwc/ directory	2017-02-21 14:59:53 -06:00
Makefile	PCI: dwc: Remove dependency of designware on CONFIG_PCI	2017-02-21 15:00:26 -06:00
msi.c	PCI: remove pci_enable_msix	2017-04-11 11:16:03 -04:00
of.c
pci-acpi.c	Merge branch 'pci/pm' into next	2016-12-12 11:25:04 -06:00
pci-driver.c	pci-v4.11-changes	2017-02-23 11:53:22 -08:00
pci-label.c
pci-mid.c	pci-v4.10-changes	2016-12-15 12:46:48 -08:00
pci-stub.c
pci-sysfs.c	PCI: Lock each enable/disable num_vfs operation in sysfs	2017-02-03 13:42:38 -06:00
pci.c	Revert "PCI: pciehp: Add runtime PM support for PCIe hotplug ports"	2017-02-03 08:53:51 -06:00
pci.h	PCI: Lock each enable/disable num_vfs operation in sysfs	2017-02-03 13:42:38 -06:00
probe.c	pci-v4.11-changes	2017-02-23 11:53:22 -08:00
proc.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
quirks.c	PCI: Prevent VPD access for QLogic ISP2722	2017-03-07 14:16:57 -06:00
remove.c	PCI: Autosense device removal in pci_bridge_d3_update()	2016-11-17 18:44:56 -06:00
rom.c	PCI: Add comments about ROM BAR updating	2016-11-29 18:05:09 -06:00
search.c
setup-bus.c	PCI: Remove res_to_dev_res() debug message	2016-12-29 11:27:52 -06:00
setup-irq.c
setup-res.c	Merge branch 'pci/host-rockchip' into next	2016-12-12 11:25:11 -06:00
slot.c	locking/atomic, kref: Add kref_read()	2017-01-14 11:37:18 +01:00
syscall.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
vc.c
vpd.c
xen-pcifront.c	xen: make use of xenbus_read_unsigned() in xen-pcifront	2016-11-07 13:55:26 +01:00