Skip to content
  • Linus Torvalds's avatar
    Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · e389f9ae
    Linus Torvalds authored
    * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (107 commits)
      smc911x: fix compilation breakage wjen debug is on
      [netdrvr] eexpress: minor corrections
      add NAPI support to sb1250-mac.c
      ixgb: ROUND_UP macro cleanup in drivers/net/ixgb
      e1000: ROUND_UP macro cleanup in drivers/net/e1000
      Generic HDLC sparse annotations
      e100: Optionally use I/O mode only to access register space
      e100: allow bad MAC address when running with invalid eeprom csum
      ehea: fix for dlpar support
      ehea: fix for sysfs entries
      3C509: Remove unnecessary include of <linux/pm_legacy.h>
      NetXen: Fix for vmalloc issues
      NetXen: Fixes for Power PC architecture
      NetXen: Port swap feature for multi port cards
      NetXen: Removal of redundant macros
      NetXen: Multi PCI support for Quad cards
      NetXen: Removal of redundant argument passing
      NetXen: Use multiple PCI functions
      [netdrvr e100] experiment with doing RX in a similar manner to eepro100
      [PATCH] ieee80211: add missing global needed by IEEE80211_DEBUG_XXXX
      ...
    e389f9ae