| commit | 4b75679f60d0ce780609cbff249769b669f4fb69 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Fri Mar 31 12:52:30 2006 -0800 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri Mar 31 12:52:30 2006 -0800 |
| tree | 2c8890020b5e7d340036acb01f73a6e53feb038d | |
| parent | 30c14e40ed85469f166b5effdab6705c73c5cd5e [diff] | |
| parent | 025be81e83043f20538dcced1e12c5f8d152fbdb [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