summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* RDMA/cma: Pass QP type into rdma_create_id()Sean Hefty2011-05-258-8/+11
* Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2011-05-1928-292/+46
|\
| * net,rcu: convert call_rcu(prl_entry_destroy_rcu) to kfreePaul E. McKenney2011-05-071-6/+1
| * batman,rcu: convert call_rcu(softif_neigh_free_rcu) to kfree_rcuPaul E. McKenney2011-05-071-9/+1
| * batman,rcu: convert call_rcu(neigh_node_free_rcu) to kfree()Paul E. McKenney2011-05-071-9/+1
| * batman,rcu: convert call_rcu(gw_node_free_rcu) to kfree_rcuPaul E. McKenney2011-05-071-9/+1
| * net,rcu: convert call_rcu(kfree_tid_tx) to kfree_rcu()Lai Jiangshan2011-05-071-11/+3
| * net,rcu: convert call_rcu(xt_osf_finger_free_rcu) to kfree_rcu()Lai Jiangshan2011-05-071-9/+2
| * net/mac80211,rcu: convert call_rcu(work_free_rcu) to kfree_rcu()Lai Jiangshan2011-05-071-9/+1
| * net,rcu: convert call_rcu(wq_free_rcu) to kfree_rcu()Lai Jiangshan2011-05-071-10/+1
| * net,rcu: convert call_rcu(phonet_device_rcu_free) to kfree_rcu()Lai Jiangshan2011-05-071-9/+1
| * net,rcu: convert call_rcu(__nf_ct_ext_free_rcu) to kfree_rcu()Lai Jiangshan2011-05-071-7/+1
| * net,rcu: convert call_rcu(net_generic_release) to kfree_rcu()Lai Jiangshan2011-05-071-9/+1
| * net,rcu: convert call_rcu(netlbl_unlhsh_free_addr6) to kfree_rcu()Lai Jiangshan2011-05-071-21/+1
| * net,rcu: convert call_rcu(netlbl_unlhsh_free_addr4) to kfree_rcu()Lai Jiangshan2011-05-071-19/+1
| * net,rcu: convert call_rcu(xps_dev_maps_release) to kfree_rcu()Lai Jiangshan2011-05-071-10/+2
| * net,rcu: convert call_rcu(xps_map_release) to kfree_rcu()Lai Jiangshan2011-05-071-9/+2
| * net,rcu: convert call_rcu(rps_map_release) to kfree_rcu()Lai Jiangshan2011-05-071-9/+2
| * net,rcu: convert call_rcu(ipv6_mc_socklist_reclaim) to kfree_rcu()Lai Jiangshan2011-05-071-6/+2
| * net,rcu: convert call_rcu(free_dm_hw_stat) to kfree_rcu()Lai Jiangshan2011-05-071-10/+2
| * net,rcu: convert call_rcu(ip_mc_socklist_reclaim) to kfree_rcu()Lai Jiangshan2011-05-071-10/+2
| * net,rcu: convert call_rcu(ip_sf_socklist_reclaim) to kfree_rcu()Lai Jiangshan2011-05-071-9/+3
| * net,rcu: convert call_rcu(ip_mc_list_reclaim) to kfree_rcu()Lai Jiangshan2011-05-071-7/+1
| * net,rcu: convert call_rcu(__gen_kill_estimator) to kfree_rcu()Lai Jiangshan2011-05-071-8/+1
| * net,rcu: convert call_rcu(__leaf_info_free_rcu) to kfree_rcu()Lai Jiangshan2011-05-071-6/+1
| * net,rcu: convert call_rcu(fc_rport_free_rcu) to kfree_rcu()Lai Jiangshan2011-05-071-11/+1
| * net,act_police,rcu: remove rcu_barrier()Lai Jiangshan2011-05-071-1/+0
| * net,rcu: convert call_rcu(dn_dev_free_ifa_rcu) to kfree_rcu()Lai Jiangshan2011-05-071-6/+1
| * net,rcu: convert call_rcu(ha_rcu_free) to kfree_rcu()Lai Jiangshan2011-05-071-10/+2
| * net,rcu: convert call_rcu(sctp_local_addr_free) to kfree_rcu()Lai Jiangshan2011-05-073-10/+3
| * net,rcu: convert call_rcu(listeners_free_rcu) to kfree_rcu()Lai Jiangshan2011-05-071-7/+1
| * net,rcu: convert call_rcu(inet6_ifa_finish_destroy_rcu) to kfree_rcu()Lai Jiangshan2011-05-071-7/+1
| * net,rcu: convert call_rcu(in6_dev_finish_destroy_rcu) to kfree_rcu()Lai Jiangshan2011-05-071-7/+1
| * net,rcu: convert call_rcu(tcf_police_free_rcu) to kfree_rcu()Lai Jiangshan2011-05-071-6/+1
| * net,rcu: convert call_rcu(tcf_common_free_rcu) to kfree_rcu()Lai Jiangshan2011-05-071-6/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-05-164-20/+14
|\ \
| * | net: Change netdev_fix_features messages loglevelMichał Mirosław2011-05-161-14/+8
| * | IPVS: fix netns if reading ip_vs_* procfs entriesHans Schillstrom2011-05-153-6/+6
| * | bridge: fix forwarding of IPv6Stephen Hemminger2011-05-151-1/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-05-132-1/+5
|\ \ \
| * | | bridge: fix forwarding of IPv6Stephen Hemminger2011-05-131-1/+1
| |/ /
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2011-05-111-0/+4
| |\ \
| | * | mac80211: don't start the dynamic ps timer if not associatedLuciano Coelho2011-05-101-0/+4
* | | | net/9p/protocol.c: Fix a memory leakPedro Scarapicchia Junior2011-05-121-0/+1
* | | | Revert "Bluetooth: fix shutdown on SCO sockets"Linus Torvalds2011-05-111-9/+0
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-05-1025-192/+322
|\| | |
| * | | Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6David S. Miller2011-05-1013-161/+262
| |\ \ \
| | * | | netfilter: revert a2361c8735e07322023aedc36e4938b35af31eb0Pablo Neira Ayuso2011-05-101-5/+0
| | * | | netfilter: IPv6: fix DSCP mangle codeFernando Luis Vazquez Cao2011-05-101-1/+1
| | * | | netfilter: IPv6: initialize TOS field in REJECT target moduleFernando Luis Vazquez Cao2011-05-101-1/+3