Linus Torvalds a57793651f Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (51 commits) [IPV6]: Fix again the fl6_sock_lookup() fixed locking [NETFILTER]: nf_conntrack_tcp: fix connection reopening fix [IPV6]: Fix race in ipv6_flowlabel_opt() when inserting two labels [IPV6]: Lost locking in fl6_sock_lookup [IPV6]: Lost locking when inserting a flowlabel in ipv6_fl_list [NETFILTER]: xt_sctp: fix mistake to pass a pointer where array is required [NET]: Fix OOPS due to missing check in dev_parse_header(). [TCP]: Remove lost_retrans zero seqno special cases [NET]: fix carrier-on bug? [NET]: Fix uninitialised variable in ip_frag_reasm() [IPSEC]: Rename mode to outer_mode and add inner_mode [IPSEC]: Disallow combinations of RO and AH/ESP/IPCOMP [IPSEC]: Use the top IPv4 route's peer instead of the bottom [IPSEC]: Store afinfo pointer in xfrm_mode [IPSEC]: Add missing BEET checks [IPSEC]: Move type and mode map into xfrm_state.c [IPSEC]: Fix length check in xfrm_parse_spi [IPSEC]: Move ip_summed zapping out of xfrm6_rcv_spi [IPSEC]: Get nexthdr from caller in xfrm6_rcv_spi [IPSEC]: Move tunnel parsing for IPv4 out of xfrm4_input ...		2007-10-18 14:40:30 -07:00
..
ircomm	[IRDA]: IrCOMM discovery indication simplification	2007-10-17 19:34:11 -07:00
irlan	[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()	2007-10-10 16:51:42 -07:00
irnet
af_irda.c	[NET]: Make socket creation namespace safe.	2007-10-10 16:49:07 -07:00
discovery.c
irda_device.c
iriap.c
iriap_event.c
irias_object.c	add kstrndup	2007-07-18 08:47:39 -07:00
irlap.c	[IRDA]: Make the IRDA use the seq_open_private()	2007-10-10 16:55:35 -07:00
irlap_event.c
irlap_frame.c	[NET]: Make packet reception network namespace safe	2007-10-10 16:49:08 -07:00
irlmp.c	[IRDA]: Make the IRDA use the seq_open_private()	2007-10-10 16:55:35 -07:00
irlmp_event.c
irlmp_frame.c
irmod.c	[IRDA]: Avoid a label defined but not used warning in irda_init()	2007-08-21 20:59:30 -07:00
irnetlink.c	[NET]: Make the device list and device lookups per namespace.	2007-10-10 16:49:10 -07:00
irproc.c	[NET]: Make /proc/net per network namespace	2007-10-10 16:49:06 -07:00
irqueue.c
irsysctl.c	sysctl: properly register the irda binary sysctl numbers	2007-10-18 14:37:23 -07:00
irttp.c	[IRDA]: Make the IRDA use the seq_open_private()	2007-10-10 16:55:35 -07:00
Kconfig
Makefile
parameters.c
qos.c
timer.c
wrapper.c