review.tizen.org Git - platform/upstream/kernel-adaptation-pc.git/commit

projects / platform / upstream / kernel-adaptation-pc.git / commit

author	Patrick McHardy <kaber@trash.net>
	Tue, 20 Apr 2010 14:02:01 +0000 (16:02 +0200)
committer	Patrick McHardy <kaber@trash.net>
	Tue, 20 Apr 2010 14:02:01 +0000 (16:02 +0200)
commit	62910554656cdcd6b6f84a5154c4155aae4ca231
tree	dcf14004f6fd2ef7154362ff948bfeba0f3ea92d	tree \| snapshot
parent	22265a5c3c103cf8c50be62e6c90d045eb649e6d	commit \| diff
parent	ab9304717f7624c41927f442e6b6d418b2d8b3e4	commit \| diff

Merge branch 'master' of /repos/git/net-next-2.6

Conflicts:
Documentation/feature-removal-schedule.txt
net/ipv6/netfilter/ip6t_REJECT.c
net/netfilter/xt_limit.c

Signed-off-by: Patrick McHardy <kaber@trash.net>

56 files changed:

Documentation/feature-removal-schedule.txt	diff1 \|	diff2 \|	blob \| history
include/linux/kernel.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_forward.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_input.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_multicast.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_netfilter.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_stp_bpdu.c	diff1 \|	diff2 \|	blob \| history
net/bridge/netfilter/ebt_ulog.c	diff1 \|	diff2 \|	blob \| history
net/bridge/netfilter/ebtables.c	diff1 \|	diff2 \|	blob \| history
net/decnet/dn_neigh.c	diff1 \|	diff2 \|	blob \| history
net/decnet/dn_nsp_in.c	diff1 \|	diff2 \|	blob \| history
net/decnet/dn_route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_forward.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ipmr.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/ip_queue.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/ipt_CLUSTERIP.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/ipt_REJECT.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/ipt_ULOG.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/nf_nat_rule.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/nf_nat_standalone.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/raw.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/xfrm4_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6mr.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/mcast.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ndisc.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/netfilter/ip6_queue.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/netfilter/ip6t_REJECT.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/netfilter/ip6t_hbh.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/netfilter/nf_conntrack_reasm.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/raw.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_ftp.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_proto.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_xmit.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_ecache.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_netlink.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_proto.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nfnetlink.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nfnetlink_queue.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/x_tables.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_CT.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_LED.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_RATEEST.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_TCPMSS.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_connlimit.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_dccp.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_hashlimit.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_limit.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_quota.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_recent.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_statistic.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_string.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_ipt.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Uncategorized;

RSS Atom

Documentation/feature-removal-schedule.txt	diff1 \|	diff2 \|	blob \| history
include/linux/kernel.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_forward.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_input.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_multicast.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_netfilter.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_stp_bpdu.c	diff1 \|	diff2 \|	blob \| history
net/bridge/netfilter/ebt_ulog.c	diff1 \|	diff2 \|	blob \| history
net/bridge/netfilter/ebtables.c	diff1 \|	diff2 \|	blob \| history
net/decnet/dn_neigh.c	diff1 \|	diff2 \|	blob \| history
net/decnet/dn_nsp_in.c	diff1 \|	diff2 \|	blob \| history
net/decnet/dn_route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_forward.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ipmr.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/ip_queue.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/ipt_CLUSTERIP.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/ipt_REJECT.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/ipt_ULOG.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/nf_nat_rule.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/netfilter/nf_nat_standalone.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/raw.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/xfrm4_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6mr.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/mcast.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ndisc.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/netfilter/ip6_queue.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/netfilter/ip6t_REJECT.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/netfilter/ip6t_hbh.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/netfilter/nf_conntrack_reasm.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/raw.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_ftp.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_proto.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_xmit.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_ecache.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_netlink.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_proto.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nfnetlink.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nfnetlink_queue.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/x_tables.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_CT.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_LED.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_RATEEST.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_TCPMSS.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_connlimit.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_dccp.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_hashlimit.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_limit.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_quota.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_recent.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_statistic.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_string.c	diff1 \|	diff2 \|	blob \| history
net/sched/act_ipt.c	diff1 \|	diff2 \|	blob \| history