David S. Miller 3efa70d78f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-02-07 16:29:30 -05:00
..
host	PCI/MSI: pci-xgene-msi: Fix CPU hotplug registration handling	2017-01-17 08:41:51 -06:00
hotplug	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
pcie	PCI/ASPM: Handle PCI-to-PCIe bridges as roots of PCIe hierarchies	2017-01-27 15:00:45 -06:00
access.c	PCI: Warn on possible RW1C corruption for sub-32 bit config writes	2016-11-21 16:25:39 -06: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: Remove pci_resource_bar() and pci_iov_resource_bar()	2016-11-29 18:05:09 -06:00
irq.c
Kconfig
Makefile
msi.c	pci-v4.10-changes	2016-12-15 12:46:48 -08:00
of.c
pci-acpi.c	Merge branch 'pci/pm' into next	2016-12-12 11:25:04 -06:00
pci-driver.c	PCI: implement num_vf bus type callback	2017-01-20 11:43:16 -05: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: Create revision file in sysfs	2016-11-21 16:25:32 -06:00
pci.c	Merge branch 'pci/virtualization' into next	2016-12-12 11:25:05 -06:00
pci.h	Merge branch 'pci/virtualization' into next	2016-12-12 11:25:05 -06:00
probe.c	PCI: Enumerate switches below PCI-to-PCIe bridges	2017-01-11 09:11:53 -06:00
proc.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
quirks.c	ktime: Cleanup ktime_set() usage	2016-12-25 17:21:22 +01: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
setup-irq.c
setup-res.c	Merge branch 'pci/host-rockchip' into next	2016-12-12 11:25:11 -06:00
slot.c
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