diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-14 03:17:26 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-14 03:17:26 +0100 |
| commit | 551a10c7fc14640d484ee3dda699758041d8123f (patch) | |
| tree | d04cb9a72b97aa4abac9e82b479be3d721fcbac5 /fs | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc (diff) | |
| parent | [IPSEC]: Fix the address family to refer encap_family (diff) | |
| download | linux-551a10c7fc14640d484ee3dda699758041d8123f.tar.xz linux-551a10c7fc14640d484ee3dda699758041d8123f.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:
[IPSEC]: Fix the address family to refer encap_family
[IPSEC]: changing API of xfrm6_tunnel_register
[IPSEC]: make sit use the xfrm4_tunnel_register
[IPSEC]: Changing API of xfrm4_tunnel_register.
[TCP]: Prevent pseudo garbage in SYN's advertized window
[NET_SCHED]: sch_hfsc: replace ASSERT macro by WARN_ON
[BRIDGE] br_if: Fix oops in port_carrier_check
[NETFILTER]: Clear GSO bits for TCP reset packet
[TG3]: Update copyright, version, and reldate.
[TG3]: Add some tx timeout debug messages.
[TG3]: Use constant for PHY register 0x1e.
[TG3]: Power down 5704 serdes transceiver when shutting down.
[TG3]: 5906 doesn't need to switch to slower clock.
[TG3]: 5722/5756 don't need PHY jitter workaround.
[TG3]: Use lower DMA watermark for 5703.
[TG3]: Save MSI state before suspend.
[XFRM]: Fix IPv4 tunnel mode decapsulation with IPV6=n
[IPV6] HASHTABLES: Use appropriate seed for caluculating ehash index.
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions