From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 31 Mar 2006 20:52:30 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.17-rc1~26
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4b75679f60d0ce780609cbff249769b669f4fb69;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge /pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NET]: Allow skb headroom to be overridden
  [TCP]: Kill unused extern decl for tcp_v4_hash_connecting()
  [NET]: add SO_RCVBUF comment
  [NET]: Deinline some larger functions from netdevice.h
  [DCCP]: Use NULL for pointers, comfort sparse.
  [DECNET]: Fix refcount
---

4b75679f60d0ce780609cbff249769b669f4fb69