Linus Torvalds f5c101892f Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu ... Pull percpu updates from Tejun Heo: "Contains Alex Shi's three patches to remove percpu_xxx() which overlap with this_cpu_xxx(). There shouldn't be any functional change." * 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: percpu: remove percpu_xxx() functions x86: replace percpu_xxx funcs with this_cpu_xxx net: replace percpu_xxx funcs with this_cpu_xxx or __this_cpu_xxx		2012-05-22 17:37:47 -07:00
..
ipset	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-16 22:17:37 -04:00
ipvs	ipvs: ip_vs_proto: local functions should not be exposed globally	2012-05-08 19:40:54 +02:00
core.c	net: Delete all remaining instances of ctl_path	2012-04-20 21:22:30 -04:00
Kconfig	netfilter: add xt_hmark target for hash-based skb marking	2012-05-09 12:54:05 +02:00
Makefile	netfilter: add xt_hmark target for hash-based skb marking	2012-05-09 12:54:05 +02:00
nf_conntrack_acct.c	net: Convert all sysctl registrations to register_net_sysctl	2012-04-20 21:22:30 -04:00
nf_conntrack_amanda.c	net: Convert net_ratelimit uses to net_<level>_ratelimited	2012-05-15 13:45:03 -04:00
nf_conntrack_broadcast.c
nf_conntrack_core.c	net: Convert net_ratelimit uses to net_<level>_ratelimited	2012-05-15 13:45:03 -04:00
nf_conntrack_ecache.c	netfilter: nf_ct_ecache: refactor notifier registration	2012-05-08 19:17:23 +02:00
nf_conntrack_expect.c	net: Convert net_ratelimit uses to net_<level>_ratelimited	2012-05-15 13:45:03 -04:00
nf_conntrack_extend.c	net: reintroduce missing rcu_assign_pointer() calls	2012-01-12 12:26:56 -08:00
nf_conntrack_ftp.c
nf_conntrack_h323_asn1.c
nf_conntrack_h323_main.c	netfilter: nf_ct_h323: fix usage of MODULE_ALIAS_NFCT_HELPER	2012-05-17 01:00:05 +02:00
nf_conntrack_h323_types.c
nf_conntrack_helper.c	netfilter: nf_conntrack: fix explicit helper attachment and NAT	2012-05-08 19:44:42 +02:00
nf_conntrack_irc.c	net: Convert net_ratelimit uses to net_<level>_ratelimited	2012-05-15 13:45:03 -04:00
nf_conntrack_l3proto_generic.c
nf_conntrack_netbios_ns.c
nf_conntrack_netlink.c	netfilter: nf_ct_expect: partially implement ctnetlink_change_expect	2012-05-08 19:40:59 +02:00
nf_conntrack_pptp.c
nf_conntrack_proto_dccp.c	net: Convert all sysctl registrations to register_net_sysctl	2012-04-20 21:22:30 -04:00
nf_conntrack_proto_generic.c	nf_conntrack_proto_generic: Stop using NLA_PUT*().	2012-04-01 18:52:31 -04:00
nf_conntrack_proto_gre.c	nf_conntrack_proto_gre: Stop using NLA_PUT*().	2012-04-01 18:52:03 -04:00
nf_conntrack_proto_sctp.c	nf_conntrack_proto_sctp: Stop using NLA_PUT*().	2012-04-01 18:51:39 -04:00
nf_conntrack_proto_tcp.c	netfilter: nf_ct_tcp: extend log message for invalid ignored packets	2012-05-17 00:56:38 +02:00
nf_conntrack_proto_udp.c	nf_conntrack_proto_udp{,lite}: Stop using NLA_PUT*().	2012-04-01 18:48:06 -04:00
nf_conntrack_proto_udplite.c	nf_conntrack_proto_udp{,lite}: Stop using NLA_PUT*().	2012-04-01 18:48:06 -04:00
nf_conntrack_proto.c	net: Convert nf_conntrack_proto to use register_net_sysctl	2012-04-20 21:22:30 -04:00
nf_conntrack_sane.c
nf_conntrack_sip.c
nf_conntrack_snmp.c
nf_conntrack_standalone.c	net: Convert all sysctl registrations to register_net_sysctl	2012-04-20 21:22:30 -04:00
nf_conntrack_tftp.c
nf_conntrack_timeout.c	netfilter: nf_ct_ext: add timeout extension	2012-03-07 17:41:25 +01:00
nf_conntrack_timestamp.c	net: Convert all sysctl registrations to register_net_sysctl	2012-04-20 21:22:30 -04:00
nf_internals.h
nf_log.c	net: Convert all sysctl registrations to register_net_sysctl	2012-04-20 21:22:30 -04:00
nf_queue.c	netfilter: nf_queue: fix queueing of bridged gro skbs	2012-02-09 20:47:53 +01:00
nf_sockopt.c
nf_tproxy_core.c
nfnetlink_acct.c	nfnetlink_acct: Stop using NLA_PUT*().	2012-04-01 18:46:29 -04:00
nfnetlink_cttimeout.c	nfnetlink_cttimeout: Stop using NLA_PUT*().	2012-04-01 18:46:00 -04:00
nfnetlink_log.c	nfnetlink_log: Stop using NLA_PUT*().	2012-04-01 18:43:44 -04:00
nfnetlink_queue.c	net: Convert net_ratelimit uses to net_<level>_ratelimited	2012-05-15 13:45:03 -04:00
nfnetlink.c	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
x_tables.c
xt_addrtype.c
xt_AUDIT.c
xt_CHECKSUM.c
xt_CLASSIFY.c
xt_cluster.c
xt_comment.c
xt_connbytes.c
xt_connlimit.c
xt_connmark.c
xt_CONNSECMARK.c
xt_conntrack.c
xt_cpu.c
xt_CT.c	netfilter: xt_CT: remove redundant header include	2012-05-17 01:00:02 +02:00
xt_dccp.c
xt_devgroup.c
xt_dscp.c
xt_DSCP.c
xt_ecn.c	netfilter: xtables: collapse conditions in xt_ecn	2011-12-27 20:45:25 +01:00
xt_esp.c
xt_hashlimit.c	netfilter: xt_hashlimit: use _ALL macro to reject unknown flag bits	2012-05-17 00:56:31 +02:00
xt_helper.c
xt_hl.c
xt_HL.c
xt_HMARK.c	netfilter: xt_HMARK: modulus is expensive for hash calculation	2012-05-17 00:56:35 +02:00
xt_IDLETIMER.c
xt_iprange.c
xt_ipvs.c
xt_LED.c
xt_length.c
xt_limit.c	netfilter: limit, hashlimit: avoid duplicated inline	2012-05-09 12:54:06 +02:00
xt_LOG.c	netfilter: xt_LOG: use CONFIG_IP6_NF_IPTABLES instead of CONFIG_IPV6	2012-03-22 11:50:56 +01:00
xt_mac.c	netfilter: Convert compare_ether_addr to ether_addr_equal	2012-05-09 20:49:18 -04:00
xt_mark.c
xt_multiport.c
xt_nfacct.c
xt_NFLOG.c
xt_NFQUEUE.c
xt_NOTRACK.c
xt_osf.c
xt_owner.c
xt_physdev.c
xt_pkttype.c
xt_policy.c
xt_quota.c
xt_rateest.c
xt_RATEEST.c
xt_realm.c
xt_recent.c	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
xt_repldata.h
xt_sctp.c
xt_SECMARK.c
xt_set.c	netfilter: ipset: fix timeout value overflow bug	2012-05-17 00:56:41 +02:00
xt_socket.c	netfilter: ip6_tables: add flags parameter to ipv6_find_hdr()	2012-05-09 12:53:47 +02:00
xt_state.c
xt_statistic.c
xt_string.c
xt_tcpmss.c
xt_TCPMSS.c	net: Convert net_ratelimit uses to net_<level>_ratelimited	2012-05-15 13:45:03 -04:00
xt_TCPOPTSTRIP.c
xt_tcpudp.c
xt_TEE.c	net: replace percpu_xxx funcs with this_cpu_xxx or __this_cpu_xxx	2012-05-14 14:15:31 -07:00
xt_time.c
xt_TPROXY.c	netfilter: ip6_tables: add flags parameter to ipv6_find_hdr()	2012-05-09 12:53:47 +02:00
xt_TRACE.c
xt_u32.c