diff options
| author | Linus Torvalds | 2006-03-23 02:36:04 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2006-03-23 02:36:04 +0100 |
| commit | 80576fd86b350a90c5be329de1e382d31121a8d0 (patch) | |
| tree | 077b2ae2c7db8d3e370c0c491253caa4926f24c1 /drivers/scsi/Makefile | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-serial (diff) | |
| parent | [TCP]: Do not use inet->id of global tcp_socket when sending RST. (diff) | |
| download | kernel-qcow2-linux-80576fd86b350a90c5be329de1e382d31121a8d0.tar.gz kernel-qcow2-linux-80576fd86b350a90c5be329de1e382d31121a8d0.tar.xz kernel-qcow2-linux-80576fd86b350a90c5be329de1e382d31121a8d0.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:
[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/scsi/Makefile')
0 files changed, 0 insertions, 0 deletions