diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-02 08:50:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-02 08:50:46 -0800 |
| commit | eb193e405155c5680ca1560b040b1551566660f9 (patch) | |
| tree | e4613f9c3a9106c0d05fb3f048fb38068f64843a /fs | |
| parent | 0ca2b776ab1f4ba99d7f592baa4ff8525e53b050 (diff) | |
| parent | 6f5b7ef6b5816dc497094048d7d8a270004602d6 (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:
[NETFILTER]: silence a warning in ebtables
[IPV6]: File the fingerprints off ah6->spi/esp6->spi
[TCP]: Set default congestion control when no sysctl.
[TIPC] net/tipc/port.c: fix NULL dereference
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions