tree ecb77b11659f85abefed71aa075d4f879a7cc116
parent a8c725045eb2eaa6c28a5493cb193f47a5c4afe4
parent 36485707bbd9729e0c52315b173aeed9bc2303dd
author Linus Torvalds <torvalds@g5.osdl.org> 1149551986 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1149551986 -0700

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