From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 5 Jun 2006 23:59:46 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.17-rc6~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ff3ea47c623276e9772cbc268471224648d5a7fe;p=~emulex%2Finfiniband.git

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [BRIDGE]: fix locking and memory leak in br_add_bridge
  [IRDA]: Missing allocation result check in irlap_change_speed().
  [PPPOE]: Missing result check in __pppoe_xmit().
  [NET]: Eliminate unused /proc/sys/net/ethernet
  [NETCONSOLE]: Clean up initcall warning.
  [TCP]: Avoid skb_pull if possible when trimming head
---

ff3ea47c623276e9772cbc268471224648d5a7fe