You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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 ...		17 years ago
..
ircomm	[IRDA]: IrCOMM discovery indication simplification	17 years ago
irlan	[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()	17 years ago
irnet	[IrDA]: Calling ppp_unregister_channel() from process context	18 years ago
Kconfig	[S390] Kconfig: unwanted menus for s390.	18 years ago
Makefile	[IrDA]: Netlink layer.	18 years ago
af_irda.c	[NET]: Make socket creation namespace safe.	17 years ago
discovery.c	[NET]: Make all initialized struct seq_operations const.	18 years ago
irda_device.c	[IrDA]: Fix IrDA build failure	18 years ago
iriap.c	[IrDA]: Fix IrDA build failure	18 years ago
iriap_event.c	…
irias_object.c	add kstrndup	18 years ago
irlap.c	[IRDA]: Make the IRDA use the seq_open_private()	17 years ago
irlap_event.c	[IrDA]: f-timer reloading when sending rejected frames.	18 years ago
irlap_frame.c	[NET]: Make packet reception network namespace safe	17 years ago
irlmp.c	[IRDA]: Make the IRDA use the seq_open_private()	17 years ago
irlmp_event.c	[NET] IRDA: Fix whitespace errors.	18 years ago
irlmp_frame.c	[NET] IRDA: Fix whitespace errors.	18 years ago
irmod.c	[IRDA]: Avoid a label defined but not used warning in irda_init()	18 years ago
irnetlink.c	[NET]: Make the device list and device lookups per namespace.	17 years ago
irproc.c	[NET]: Make /proc/net per network namespace	17 years ago
irqueue.c	[IrDA]: irda lockdep annotation	18 years ago
irsysctl.c	sysctl: properly register the irda binary sysctl numbers	17 years ago
irttp.c	[IRDA]: Make the IRDA use the seq_open_private()	17 years ago
parameters.c	[IrDA]: Misc spelling corrections.	18 years ago
qos.c	[SK_BUFF]: Convert skb->tail to sk_buff_data_t	18 years ago
timer.c	[NET] IRDA: Fix whitespace errors.	18 years ago
wrapper.c	[SK_BUFF]: Introduce skb_copy_to_linear_data{_offset}	18 years ago