aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/sfc/workarounds.h (follow)
AgeCommit message (Collapse)AuthorFilesLines
2011-09-22Merge branch 'master' of github.com:davem330/netDavid S. Miller1-2/+0
Conflicts: MAINTAINERS drivers/net/Kconfig drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c drivers/net/ethernet/broadcom/tg3.c drivers/net/wireless/iwlwifi/iwl-pci.c drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c drivers/net/wireless/rt2x00/rt2800usb.c drivers/net/wireless/wl12xx/main.c
2011-08-11sfc: Move the Solarflare driversJeff Kirsher1-0/+61
Moves the Solarflare drivers into drivers/net/ethernet/sfc/ and make the necessary Kconfig and Makefile changes. CC: Steve Hodgson <shodgson@solarflare.com> CC: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>