David S. Miller 0d6c4a2e46 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/e1000e/param.c drivers/net/wireless/iwlwifi/iwl-agn-rx.c drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c drivers/net/wireless/iwlwifi/iwl-trans.h Resolved the iwlwifi conflict with mainline using 3-way diff posted by John Linville and Stephen Rothwell. In 'net' we added a bug fix to make iwlwifi report a more accurate skb->truesize but this conflicted with RX path changes that happened meanwhile in net-next. In e1000e a conflict arose in the validation code for settings of adapter->itr. 'net-next' had more sophisticated logic so that logic was used. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-05-07 23:35:40 -04:00
..
hotplug	PCI: make acpihp use __pci_remove_bus_device instead	2012-02-27 12:17:16 -08:00
pcie	ASPM: Fix pcie devices with non-pcie children	2012-03-31 12:49:56 -07:00
.gitignore
access.c	PCI: Introduce INTx check & mask API	2012-01-06 12:10:34 -08:00
ats.c	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci	2012-01-11 18:50:26 -08:00
bus.c	PCI: add struct pci_host_bridge_window with CPU/bus address offset	2012-02-23 20:19:00 -07:00
hotplug-pci.c
hotplug.c
htirq.c
ioapic.c	pci, x86/io-apic: Allow PCI_IOAPIC to be user configurable on x86	2011-12-06 09:21:05 +01:00
iov.c	PCI: Rename pci_remove_bus_device to pci_stop_and_remove_bus_device	2012-02-27 12:12:18 -08:00
irq.c
Kconfig	PCI: add a PCI resource reallocation config option	2012-02-24 09:38:59 -08:00
Makefile	pci: frv architecture needs generic setup-bus infrastructure	2012-04-26 14:46:17 -04:00
msi.c	x86/PCI: Expand the x86_msi_ops to have a restore MSIs.	2012-01-06 14:02:26 -08:00
msi.h
of.c
pci-acpi.c	ACPI, PCI: Move acpi_dev_run_wake() to ACPI core	2012-03-30 02:21:18 -04:00
pci-driver.c	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci	2012-03-23 14:02:12 -07:00
pci-label.c	switch ->is_visible() to returning umode_t	2012-01-03 22:54:55 -05:00
pci-stub.c
pci-sysfs.c	PCI: Rename pci_remove_bus_device to pci_stop_and_remove_bus_device	2012-02-27 12:12:18 -08:00
pci.c	PCI: Retry BARs restoration for Type 0 headers only	2012-04-16 18:33:35 -07:00
pci.h	PCI: Move "pci reassigndev resource alignment" out of quirks.c	2012-02-24 14:37:26 -08:00
probe.c	PCI: fix bridge I/O window bus-to-resource conversion	2012-03-20 10:41:27 -07:00
proc.c
quirks.c	atl1c: add workaround for issue of bit INTX-disable for MSI interrupt	2012-04-30 21:44:12 -04:00
remove.c	PCI: export __pci_remove_bus_device	2012-02-27 12:16:55 -08:00
rom.c
search.c
setup-bus.c	Merge branch 'pci-next+probe_only+bus2res-fb127cb' of git://github.com/bjorn-helgaas/linux into linux-next	2012-02-24 14:25:33 -08:00
setup-irq.c
setup-res.c	PCI: Move "pci reassigndev resource alignment" out of quirks.c	2012-02-24 14:37:26 -08:00
slot.c
syscall.c
vpd.c
xen-pcifront.c	Two fixes for regressions:	2012-04-06 17:54:53 -07:00