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: [NET]: Fix possible dev_deactivate race condition [INET]: Justification for local port range robustness. [PACKET]: Kill unused pg_vec_endpage() function [NET]: QoS/Sched as menuconfig [NET]: Fix bug in sk_filter race cures. [PATCH] mac80211: make ieee802_11_parse_elems return void
Showing
- drivers/infiniband/core/cma.c 3 additions, 2 deletionsdrivers/infiniband/core/cma.c
- net/core/filter.c 2 additions, 1 deletionnet/core/filter.c
- net/ipv4/inet_connection_sock.c 1 addition, 1 deletionnet/ipv4/inet_connection_sock.c
- net/ipv4/inet_hashtables.c 1 addition, 1 deletionnet/ipv4/inet_hashtables.c
- net/ipv4/sysctl_net_ipv4.c 2 additions, 2 deletionsnet/ipv4/sysctl_net_ipv4.c
- net/ipv4/udp.c 3 additions, 2 deletionsnet/ipv4/udp.c
- net/ipv6/inet6_hashtables.c 1 addition, 1 deletionnet/ipv6/inet6_hashtables.c
- net/mac80211/ieee80211_sta.c 9 additions, 46 deletionsnet/mac80211/ieee80211_sta.c
- net/packet/af_packet.c 0 additions, 5 deletionsnet/packet/af_packet.c
- net/sched/Kconfig 3 additions, 7 deletionsnet/sched/Kconfig
- net/sched/sch_generic.c 23 additions, 3 deletionsnet/sched/sch_generic.c
Loading
Please register or sign in to comment