diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 17:36:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 17:36:04 -0800 |
| commit | 80576fd86b350a90c5be329de1e382d31121a8d0 (patch) | |
| tree | 077b2ae2c7db8d3e370c0c491253caa4926f24c1 /drivers/pci/proc.c | |
| parent | 9d8f057acbd38d8177cf2ffd5e151d52c2477372 (diff) | |
| parent | 1a55d57b107c3e06935763905dc0fb235214569d (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:
[TCP]: Do not use inet->id of global tcp_socket when sending RST.
[NETFILTER]: Fix undefined references to get_h225_addr
[NETFILTER]: futher {ip,ip6,arp}_tables unification
[NETFILTER]: Fix xt_policy address matching
[NETFILTER]: nf_conntrack: support for layer 3 protocol load on demand
[NETFILTER]: x_tables: set the protocol family in x_tables targets/matches
[NETFILTER]: conntrack: cleanup the conntrack ID initialization
[NETFILTER]: nfnetlink_queue: fix nfnetlink message size
[NETFILTER]: ctnetlink: Fix expectaction mask dumping
[NETFILTER]: Fix Kconfig typos
[NETFILTER]: Fix ip6tables breakage from {get,set}sockopt compat layer
Diffstat (limited to 'drivers/pci/proc.c')
0 files changed, 0 insertions, 0 deletions