summaryrefslogtreecommitdiffstats
path: root/include/linux/bcma/bcma_driver_pci.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-09-27 13:27:49 -0400
committerDavid S. Miller <davem@davemloft.net>2013-09-27 13:27:49 -0400
commit89f077a08508cfb38db34b37b0ea6c66e4e7b233 (patch)
tree619ddf9afe916ddeb15b407309678771229875d3 /include/linux/bcma/bcma_driver_pci.h
parentf875691640cd3fa67f7ad1d3130ff9fa7fdca042 (diff)
parentd7595a226f6b304f0e51fc31f96bf00d1500f78a (diff)
downloadlinux-89f077a08508cfb38db34b37b0ea6c66e4e7b233.tar.gz
linux-89f077a08508cfb38db34b37b0ea6c66e4e7b233.tar.bz2
linux-89f077a08508cfb38db34b37b0ea6c66e4e7b233.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net
Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates This series contains updates to igb and i40e. Todd provides a fix for 82580 devices in igb, where the ethtool loopback test was missing 82580 copper devices. Jesse provides five fixes/cleanups to i40e based on feedback from Joe Perches and the community. v2: fixed up patch 5 in the series based on feedback from Joe Perches and David Miller ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/bcma/bcma_driver_pci.h')
0 files changed, 0 insertions, 0 deletions