| commit | 12145387a042e8aa4439485f8976e6992a529b12 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Apr 24 18:20:32 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Tue Apr 24 18:20:32 2007 -0700 |
| tree | ae161089e3058663510033fa85ed05115ab3b550 | |
| parent | 6f4c5bdef2943d9ec074be32c437ca897016aaad [diff] | |
| parent | 68c9f75a0539db583db074059d54deb607d1a475 [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: [BNX2]: Fix occasional NETDEV WATCHDOG on 5709. [IPV6]: Disallow RH0 by default. [XFRM]: beet: fix pseudo header length value [TCP]: Congestion control initialization.