diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-16 14:45:23 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-16 14:45:23 -0500 |
| commit | 626db29f31ce253726411182ff6c15e31efe2e9a (patch) | |
| tree | 5a4f1f01eafa3eae7c79c4c066f09dedb0975ec7 /fs/cifs | |
| parent | b342baa737164e86cc67d5f16a305d04895ef338 (diff) | |
| parent | c7835a77c86422d276b0d1a4c70924d933014c13 (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:
[TG3]: Disable TSO on 5906 if CLKREQ is enabled.
[TCP]: Fix up sysctl_tcp_mem initialization.
[NETFILTER]: ip6_tables: use correct nexthdr value in ipv6_find_hdr()
[NETFILTER]: ip6_tables: fixed conflicted optname for getsockopt
[NETFILTER]: Use pskb_trim in {ip,ip6,nfnetlink}_queue
[NETFILTER]: nfnetlink_log: fix byteorder of NFULA_SEQ_GLOBAL
[TG3]: Increase 5906 firmware poll time.
Diffstat (limited to 'fs/cifs')
0 files changed, 0 insertions, 0 deletions