diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-18 08:25:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-18 08:25:14 -0700 |
| commit | bfea13d4a127aab4c10085b6f9b6e2ff4f023f79 (patch) | |
| tree | 4195848eb43a12409511cea39903c3e4c6249281 /net/ipx | |
| parent | slub: another slabinfo fix (diff) | |
| parent | [IPV4]: Remove IPVS icmp hack from route.c for now. (diff) | |
| download | linux-dev-bfea13d4a127aab4c10085b6f9b6e2ff4f023f79.tar.xz linux-dev-bfea13d4a127aab4c10085b6f9b6e2ff4f023f79.zip | |
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:
[IPV4]: Remove IPVS icmp hack from route.c for now.
[IPV4]: Correct rp_filter help text.
[TCP]: TCP_CONG_YEAH requires TCP_CONG_VEGAS
[TCP] slow start: Make comments and code logic clearer.
[BLUETOOTH]: Fix locking in hci_sock_dev_event().
[NET]: Fix BMSR_100{HALF,FULL}2 defines in linux/mii.h
[NET]: lockdep classes in register_netdevice
Diffstat (limited to 'net/ipx')
0 files changed, 0 insertions, 0 deletions