Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Merge commit. Changes below are compared with the first parent: c544bdb1.
Changes
50 files changed · +190 −425
Only the first 600 diff lines are shown. Download the complete patch.
drivers/atm/zatm.c
View filedrivers/net/irda/Kconfig
View filedrivers/net/irda/Makefile
View filedrivers/net/irda/sir-dev.h
View filedrivers/net/irda/sir_core.c
View before deletiondrivers/net/irda/sir_dev.c
View filedrivers/net/irda/sir_dongle.c
View filedrivers/net/irda/sir_kthread.c
View fileinclude/linux/netfilter_ipv4/ip_nat_protocol.h
View fileinclude/linux/netfilter_ipv6.h
View fileinclude/net/inet_connection_sock.h
View filenet/8021q/vlan_dev.c
View filenet/atm/br2684.c
View filenet/atm/lec.c
View filenet/atm/mpc.c
View filenet/bluetooth/bnep/core.c
View filenet/bluetooth/hci_conn.c
View filenet/bridge/netfilter/ebt_ip.c
View filenet/bridge/netfilter/ebt_stp.c
View filenet/core/dv.c
View filenet/core/wireless.c
View filenet/ieee80211/ieee80211_rx.c
View filenet/ipv4/Makefile
View filenet/ipv4/netfilter.c
View filenet/ipv4/netfilter/ip_conntrack_proto_generic.c
View filenet/ipv4/netfilter/ip_conntrack_proto_icmp.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/netfilter/ip_conntrack_proto_sctp.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/netfilter/ip_conntrack_proto_tcp.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/netfilter/ip_conntrack_proto_udp.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/netfilter/ip_conntrack_standalone.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/netfilter/ip_nat_helper_pptp.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/netfilter/ip_nat_proto_gre.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/netfilter/ip_nat_proto_icmp.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/netfilter/ip_nat_proto_tcp.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/netfilter/ip_nat_proto_udp.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/netfilter/ip_nat_proto_unknown.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/netfilter/ipt_mac.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv6/Makefile
View fileThis diff is incomplete. Download the complete patch.
net/ipv6/netfilter.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv6/netfilter/ip6t_mac.c
View fileThis diff is incomplete. Download the complete patch.
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
View fileThis diff is incomplete. Download the complete patch.
net/netfilter/nf_conntrack_proto_generic.c
View fileThis diff is incomplete. Download the complete patch.
net/netfilter/nf_conntrack_proto_sctp.c
View fileThis diff is incomplete. Download the complete patch.
net/netfilter/nf_conntrack_proto_tcp.c
View fileThis diff is incomplete. Download the complete patch.
net/netfilter/nf_conntrack_proto_udp.c
View fileThis diff is incomplete. Download the complete patch.
net/netfilter/nf_conntrack_standalone.c
View fileThis diff is incomplete. Download the complete patch.
net/netlink/af_netlink.c
View fileThis diff is incomplete. Download the complete patch.
net/rxrpc/connection.c
View fileThis diff is incomplete. Download the complete patch.
net/sunrpc/svc.c
View fileThis diff is incomplete. Download the complete patch.