linux/drivers/net/sfc
Linus Torvalds d73b388459 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI/PM: Report wakeup events before resuming devices
  PCI/PM: Use pm_wakeup_event() directly for reporting wakeup events
  PCI: sysfs: Update ROM to include default owner write access
  x86/PCI: make Broadcom CNB20LE driver EMBEDDED and EXPERIMENTAL
  x86/PCI: don't use native Broadcom CNB20LE driver when ACPI is available
  PCI/ACPI: Request _OSC control once for each root bridge (v3)
  PCI: enable pci=bfsort by default on future Dell systems
  PCI/PCIe: Clear Root PME Status bits early during system resume
  PCI: pci-stub: ignore zero-length id parameters
  x86/PCI: irq and pci_ids patch for Intel Patsburg
  PCI: Skip id checking if no id is passed
  PCI: fix __pci_device_probe kernel-doc warning
  PCI: make pci_restore_state return void
  PCI: Disable ASPM if BIOS asks us to
  PCI: Add mask bit definition for MSI-X table
  PCI: MSI: Move MSI-X entry definition to pci_regs.h

Fix up trivial conflicts in drivers/net/{skge.c,sky2.c} that had in the
meantime been converted to not use legacy PCI power management, and thus
no longer use pci_restore_state() at all (and that caused trivial
conflicts with the "make pci_restore_state return void" patch)
2011-01-14 09:29:05 -08:00
..
bitfield.h sfc: Update version, copyright dates, authors 2009-11-29 17:23:58 -08:00
efx.c sfc: Remove ancient support for nesting of TX stop 2010-12-10 19:53:46 +00:00
efx.h sfc: Remove ancient support for nesting of TX stop 2010-12-10 19:53:46 +00:00
enum.h sfc: Update version, copyright dates, authors 2009-11-29 17:23:58 -08:00
ethtool.c netdev: Use default implementation of ethtool_ops::get_link where possible 2010-12-10 15:55:24 -08:00
falcon_boards.c sfc: Move xmac_poll_required into struct falcon_nic_data 2010-12-03 09:08:09 -08:00
falcon_xmac.c sfc: Move xmac_poll_required into struct falcon_nic_data 2010-12-03 09:08:09 -08:00
falcon.c Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2011-01-14 09:29:05 -08:00
filter.c sfc: Generalise filter spec initialisation 2010-12-07 19:11:26 +00:00
filter.h sfc: Generalise filter spec initialisation 2010-12-07 19:11:26 +00:00
io.h sfc: Remove locking from implementation of efx_writeo_paged() 2010-12-06 22:58:41 +00:00
Kconfig sfc: Add support for SFC9000 family (2) 2009-11-29 17:23:57 -08:00
mac.h sfc: make functions static 2010-10-21 03:09:43 -07:00
Makefile sfc: Add support for SFE4003 board and TXC43128 PHY 2010-09-22 13:26:45 -07:00
mcdi_mac.c sfc: Implement message level control 2010-06-24 22:13:22 -07:00
mcdi_pcol.h sfc: Update MCDI protocol definitions 2010-04-28 12:44:37 -07:00
mcdi_phy.c sfc: Remove unnecessary inclusion of various private header files 2010-12-03 09:08:07 -08:00
mcdi.c sfc: Fix event based MCDI completion and MC REBOOT/CMDDONE ordering issue 2010-12-03 09:08:05 -08:00
mcdi.h sfc: make functions static 2010-10-21 03:09:43 -07:00
mdio_10g.c sfc: Remove unnecessary inclusion of various private header files 2010-12-03 09:08:07 -08:00
mdio_10g.h sfc: Implement message level control 2010-06-24 22:13:22 -07:00
mtd.c sfc: Move SPI state to struct falcon_nic_data 2010-12-03 09:08:07 -08:00
net_driver.h sfc: Remove ancient support for nesting of TX stop 2010-12-10 19:53:46 +00:00
nic.c Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6 2010-12-10 10:20:43 -08:00
nic.h sfc: Update kernel-doc to match earlier move of Toeplitz hash key 2010-12-03 09:08:09 -08:00
phy.h sfc: Add support for SFE4003 board and TXC43128 PHY 2010-09-22 13:26:45 -07:00
qt202x_phy.c sfc: Clear RXIN_SEL when soft-resetting QT2025C 2010-12-03 09:08:04 -08:00
regs.h sfc: Add filter table management 2010-09-21 14:58:00 -07:00
rx.c sfc: convert references to LRO to GRO 2010-12-10 15:03:24 -08:00
selftest.c sfc: make functions static 2010-10-21 03:09:43 -07:00
selftest.h sfc: Create multiple TX queues 2010-04-28 12:44:44 -07:00
siena.c sfc: Store MAC address from NVRAM in net_device::perm_addr 2010-12-03 09:08:11 -08:00
spi.h sfc: Move SPI state to struct falcon_nic_data 2010-12-03 09:08:07 -08:00
tenxpress.c sfc: Remove unnecessary inclusion of various private header files 2010-12-03 09:08:07 -08:00
tx.c sfc: Remove ancient support for nesting of TX stop 2010-12-10 19:53:46 +00:00
txc43128_phy.c sfc: Add support for SFE4003 board and TXC43128 PHY 2010-09-22 13:26:45 -07:00
workarounds.h sfc: Remove support for SFN4111T, SFT9001 and Falcon GMAC 2010-09-22 13:26:45 -07:00