]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 30c14e4 025be81)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 31 Mar 2006 20:52:30 +0000 (12:52 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 31 Mar 2006 20:52:30 +0000 (12:52 -0800)
commit4b75679f60d0ce780609cbff249769b669f4fb69
tree2c8890020b5e7d340036acb01f73a6e53feb038dtree | snapshot
parent30c14e40ed85469f166b5effdab6705c73c5cd5ecommit | diff
parent025be81e83043f20538dcced1e12c5f8d152fbdbcommit | diff
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:
  [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
Linux 2.6 source tree