1. 10 Jul, 2006 38 commits
  2. 09 Jul, 2006 2 commits
    • Linus Torvalds's avatar
      Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 of HEAD · 09075ef0
      Linus Torvalds authored
      * HEAD:
        [AX.25]: Use kzalloc
        [ATM] net/atm/clip.c: fix PROC_FS=n compile
        [PKT_SCHED]: act_api: Fix module leak while flushing actions
        [NET]: Fix IPv4/DECnet routing rule dumping
        [NET] gso: Fix up GSO packets with broken checksums
        [NET] gso: Add skb_is_gso
        [IRDA]: fix drivers/net/irda/ali-ircc.c:ali_ircc_init()
        [ATM]: fix possible recursive locking in skb_migrate()
        [ATM]: Typo in drivers/atm/Kconfig...
        [TG3]: add amd8131 to "write reorder" chipsets
        [NET]: Fix network device interface printk message priority
      09075ef0
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · c87fed15
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (23 commits)
        [PATCH] 8139too deadlock fix
        [netdrvr] 3c59x: snip changelog from source code
        e1000: increase version to 7.1.9-k2
        e1000: add ich8lan device ID's
        e1000: allow user to disable ich8 lock loss workaround
        e1000: integrate ich8 support into driver
        e1000: add ich8lan core functions
        e1000: disable ERT
        e1000: check return value of _get_speed_and_duplex
        e1000: M88 PHY workaround
        e1000: fix adapter led blinking inconsistency
        e1000: disable CRC stripping workaround
        e1000: force register write flushes to circumvent broken platforms
        e1000: rework module param code with uninitialized values
        e1000: recycle skb
        e1000: change printk into DPRINTK
        e1000: add smart power down code
        e1000: small performance tweak by removing double code
        e1000: fix CONFIG_PM blocks
        e1000: Make PHY powerup/down a function
        ...
      c87fed15