1. 03 10月, 2006 38 次提交
  2. 02 10月, 2006 2 次提交
    • L
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 95f3eff6
      Linus Torvalds 提交于
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (37 commits)
        [netdrvr] hp100: encapsulate all non-module code
        drivers/net/wireless/{airo,ipw2100}: fix error handling bugs
        [netdrvr] phy: Fix bugs in error handling
        [PATCH] spidernet: Use pci_dma_mapping_error()
        [PATCH] sky2: version 1.9
        [PATCH] sky2: fragmented receive for large MTU
        [PATCH] sky2: use netif_tx_lock instead of LLTX
        [PATCH] sky2: incremental transmit completion
        [PATCH] sky2: name irq after eth for irqbalance
        [PATCH] sky2: workarounds for some 88e806x chips
        [PATCH] sky2: use standard pci register capabilties for error register
        [PATCH] sky2: gigabit full duplex negotiation
        e100, e1000, ixgb: increment version numbers
        ixgb: convert to netdev_priv(netdev)
        ixgb: combine more rx descriptors to improve performance
        e1000: possible memory leak in e1000_set_ringparam
        e1000: Janitor: Use #defined values for literals
        e1000: don't strip vlan ID if 8021q claims it
        e1000: rework polarity, NVM, eeprom code and fixes.
        e1000: driver state fixes (race fix)
        ...
      95f3eff6
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6 · 44f54921
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
        JFS: White space cleanup
        [PATCH] JFS: return correct error when i-node allocation failed
        JFS: Remove shadow variable from fs/jfs/jfs_txnmgr.c:xtLog()
      44f54921