aboutsummaryrefslogtreecommitdiffstats
path: root/init/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2007-01-10 08:30:22 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2007-01-10 08:30:22 -0800
commit8edf51a5ee38eb40de5449e131fd36450a229430 (patch)
treed2c5cd3b9a16a09a933ec345e12eb9272bcd0e67 /init/Makefile
parent[PATCH] MAINTAINERS: maintainer for sata_promise (diff)
parent[IPV4] devinet: inetdev_init out label moved after RCU assignment (diff)
downloadlinux-dev-8edf51a5ee38eb40de5449e131fd36450a229430.tar.xz
linux-dev-8edf51a5ee38eb40de5449e131fd36450a229430.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: [IPV4] devinet: inetdev_init out label moved after RCU assignment [INET]: style updates for the inet_sock->is_icsk assignment fix [SCTP]: Fix err_hdr assignment in sctp_init_cause. [NETFILTER]: tcp conntrack: fix IP_CT_TCP_FLAG_CLOSE_INIT value [NETFILTER]: nf_nat: fix hanging connections when loading the NAT module [NETFILTER]: arp_tables: fix userspace compilation [NETFILTER]: nf_conntrack_ipv6: fix crash when handling fragments
Diffstat (limited to 'init/Makefile')
0 files changed, 0 insertions, 0 deletions