diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-25 03:20:32 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-25 03:20:32 +0200 |
| commit | 12145387a042e8aa4439485f8976e6992a529b12 (patch) | |
| tree | ae161089e3058663510033fa85ed05115ab3b550 /block | |
| parent | [MIPS] Fix oprofile logic to physical counter remapping (diff) | |
| parent | [BNX2]: Fix occasional NETDEV WATCHDOG on 5709. (diff) | |
| download | linux-12145387a042e8aa4439485f8976e6992a529b12.tar.xz linux-12145387a042e8aa4439485f8976e6992a529b12.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:
[BNX2]: Fix occasional NETDEV WATCHDOG on 5709.
[IPV6]: Disallow RH0 by default.
[XFRM]: beet: fix pseudo header length value
[TCP]: Congestion control initialization.
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions