From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun, 9 Jul 2006 22:50:41 +0000 (-0700)
Subject: Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 of HEAD
X-Git-Tag: v2.6.18-rc2~254
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09075ef0fd585fb093bb9a6cd1240272114f89cf;p=linux-2.6

Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 of HEAD

* 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
---

09075ef0fd585fb093bb9a6cd1240272114f89cf