• 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
e1000_main.c 136 KB