summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-05-268-8/+11
|\
| * RDMA/cma: Pass QP type into rdma_create_id()Sean Hefty2011-05-258-8/+11
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfdLinus Torvalds2011-05-252-1/+69
|\ \
| * | net: fix get_net_ns_by_fd for !CONFIG_NET_NSStephen Rothwell2011-05-241-22/+27
| * | net: Allow setting the network namespace by fdEric W. Biederman2011-05-102-3/+35
| * | ns proc: Add support for the network namespace.Eric W. Biederman2011-05-101-0/+31
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-05-2539-158/+496
|\ \ \
| * | | net: hold rtnl again in dump callbacksEric Dumazet2011-05-252-2/+8
| * | | sch_sfq: fix peek() implementationEric Dumazet2011-05-251-13/+1
| * | | sctp: fix memory leak of the ASCONF queue when free asocWei Yongjun2011-05-251-0/+16
| * | | net: make dev_disable_lro use physical device if passed a vlan dev (v2)Neil Horman2011-05-251-0/+7
| * | | net: move is_vlan_dev into public header file (v2)Neil Horman2011-05-251-5/+0
| * | | Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/...David S. Miller2011-05-2512-100/+417
| |\ \ \
| | * \ \ Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next...John W. Linville2011-05-2412-100/+417
| | |\ \ \
| | | * | | nl80211: remove some stack variables in trigger_scan and start_sched_scanLuciano Coelho2011-05-191-8/+4
| | | * | | mac80211: Don't sleep when growing the mesh pathJavier Cardona2011-05-191-3/+3
| | | * | | net: rfkill: add generic gpio rfkill driverRhyland Klein2011-05-193-0/+237
| | | * | | cfg80211: Use consistent BSS matching between scan and smeJouni Malinen2011-05-193-7/+19
| | | * | | mac80211: annotate and fix RCU in mesh codeJohannes Berg2011-05-162-56/+102
| | | * | | mac80211: fix and simplify mesh lockingJohannes Berg2011-05-162-22/+25
| | | * | | mac80211: add missing rcu_barrierJohannes Berg2011-05-161-0/+2
| | | * | | mac80211: abort scan_work immediately when the device goes downRajkumar Manoharan2011-05-162-2/+7
| | | * | | mac80211: verify IBSS in interface combinationsJohannes Berg2011-05-161-3/+17
| | | * | | mac80211: Deactivate mesh path timers when freeing nodesJavier Cardona2011-05-161-1/+3
| * | | | | bridge: initialize fake_rtable metricsEric Dumazet2011-05-241-1/+5
| * | | | | net: fix __dst_destroy_metrics_generic()Eric Dumazet2011-05-241-1/+1
| * | | | | igmp: call ip_mc_clear_src() only when we have no users of ip_mc_listVeaceslav Falico2011-05-241-5/+5
| * | | | | net: use synchronize_rcu_expedited()Eric Dumazet2011-05-241-1/+4
| * | | | | net: convert %p usage to %pKDan Rosenberg2011-05-2414-22/+22
| * | | | | ipv6: Fix return of xfrm6_tunnel_rcv()David S. Miller2011-05-241-1/+1
| * | | | | net: filter: Use WARN_RATELIMITJoe Perches2011-05-231-1/+3
| * | | | | sch_sfq: avoid giving spurious NET_XMIT_CN signalsEric Dumazet2011-05-231-2/+6
| * | | | | snap: remove one synchronize_net()Eric Dumazet2011-05-231-1/+0
| * | | | | net: ping: cleanups ping_v4_unhash()Eric Dumazet2011-05-231-3/+0
* | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2011-05-253-25/+89
|\ \ \ \ \ \
| * | | | | | libceph: subscribe to osdmap when cluster is fullSage Weil2011-05-241-0/+9
| * | | | | | libceph: handle new osdmap down/state change encodingSage Weil2011-05-241-3/+8
| * | | | | | ceph: check return value for start_request in writepagesSage Weil2011-05-191-1/+7
| * | | | | | libceph: add missing breaks in addr_set_portSage Weil2011-05-191-0/+2
| * | | | | | libceph: fix TAG_WAIT caseSage Weil2011-05-191-1/+3
| * | | | | | libceph: fix osdmap timestamp assignmentSage Weil2011-05-191-1/+1
| * | | | | | libceph: use snprintf for unknown addrsSage Weil2011-05-191-1/+2
| * | | | | | libceph: use snprintf for formatting object nameSage Weil2011-05-191-1/+1
| * | | | | | libceph: fix uninitialized value when no get_authorizer method is setSage Weil2011-05-191-5/+6
| * | | | | | libceph: handle connection reopen race with callbacksSage Weil2011-05-191-13/+51
* | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/eri...Linus Torvalds2011-05-255-23/+28
|\ \ \ \ \ \ \
| * | | | | | | net/9p: enable 9p to work in non-default network namespaceRob Landley2011-05-251-3/+4
| * | | | | | | net/9p: p9_idpool_get return -1 on errorAneesh Kumar K.V2011-05-252-9/+13
| * | | | | | | 9p: remove experimental tag from tested configurationsEric Van Hensbergen2011-05-251-4/+4
| * | | | | | | 9p: typo fixes and minor cleanupsRob Landley2011-05-251-5/+5