• L
    Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 6ed911fb
    Linus Torvalds 提交于
    * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (40 commits)
      bonding/bond_main.c: make 2 functions static
      ps3: gigabit ethernet driver for PS3, take3
      [netdrvr] Fix dependencies for ax88796 ne2k clone driver
      eHEA: Capability flag for DLPAR support
      Remove sk98lin ethernet driver.
      sunhme.c:quattro_pci_find() must be __devinit
      bonding / ipv6: no addrconf for slaves separately from master
      atl1: remove write-only var in tx handler
      macmace: use "unsigned long flags;"
      Cleanup usbnet_probe() return value handling
      netxen: deinline and sparse fix
      eeprom_93cx6: shorten pulse timing to match spec (bis)
      phylib: Add Marvell 88E1112 phy id
      phylib: cleanup marvell.c a bit
      AX88796 network driver
      IOC3: Switch to pci refcounting safe APIs
      e100: Fix Tyan motherboard e100 not receiving IPMI commands
      QE Ethernet driver writes to wrong register to mask interrupts
      rrunner.c:rr_init() must be __devinit
      tokenring/3c359.c:xl_init() must be __devinit
      ...
    6ed911fb
MAINTAINERS 88.2 KB