summaryrefslogtreecommitdiff
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-06-0414-53/+95
|\
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-06-032-20/+25
| |\
| | * bluetooth l2cap: fix locking in l2cap_global_chan_by_psmJohannes Berg2011-06-011-1/+1
| | * cfg80211: don't drop p2p probe responsesEliad Peller2011-06-011-19/+24
| * | net: tracepoint of net_dev_xmit sees freed skb and causes panicKoki Sanagi2011-06-021-2/+5
| * | af-packet: Add flag to distinguish VID 0 from no-vlan.Ben Greear2011-06-011-3/+12
| * | caif: Fix race when conditionally taking rtnl locksjur.brandeland@stericsson.com2011-06-011-6/+3
| * | vlan: fix typo in vlan_dev_hard_start_xmit()Wei Yongjun2011-06-011-1/+1
| * | net/ipv4: Check for mistakenly passed in non-IPv4 addressMarcus Meissner2011-06-011-0/+3
| * | sctp: stop pending timers and purge queues when peer restart asocWei Yongjun2011-05-313-11/+29
| * | ip_options_compile: properly handle unaligned pointerChris Metcalf2011-05-311-7/+8
| |/
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2....John W. Linville2011-05-273-3/+9
| |\
| | * mac80211: Remove duplicate linux/slab.h include from net/mac80211/scan.cJesper Juhl2011-05-271-1/+0
| | * mac80211: clear local->ps_data on disassocEliad Peller2011-05-271-0/+1
| | * mac80211: stop queues before rate control updationRajkumar Manoharan2011-05-261-0/+6
| | * nl80211: fix check for valid SSID size in scan operationsLuciano Coelho2011-05-261-2/+2
* | | Merge branch 'pnfs-submit' of git://git.open-osd.org/linux-open-osdLinus Torvalds2011-05-291-0/+19
|\ \ \
| * | | SUNRPC: introduce xdr_init_decode_pagesBenny Halevy2011-05-291-0/+19
* | | | Merge branch 'for-2.6.40' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2011-05-291-148/+188
|\ \ \ \
| * | | | svcrpc: complete svsk processing on cb receive failureJ. Bruce Fields2011-04-101-4/+3
| * | | | svcrpc: take advantage of tcp autotuningOlga Kornievskaia2011-04-071-28/+7
| * | | | SUNRPC: Don't wait for full record to receive tcp dataJ. Bruce Fields2011-04-071-32/+112
| * | | | svcrpc: copy cb reply instead of pagesTrond Myklebust2011-04-071-66/+56
| * | | | svcrpc: close connection if client sends short packetJ. Bruce Fields2011-04-071-14/+7
| * | | | svcrpc: note network-order types in svc_process_calldirJ. Bruce Fields2011-04-071-3/+3
| * | | | SUNRPC: svc_tcp_recvfrom cleanupTrond Myklebust2011-04-071-19/+15
| * | | | SUNRPC: requeue tcp socket less frequentlyTrond Myklebust2011-04-071-1/+4
* | | | | Merge branch 'nfs-for-2.6.40' of git://git.linux-nfs.org/projects/trondmy/nfs...Linus Torvalds2011-05-294-45/+518
|\ \ \ \ \
| * | | | | SUNRPC: Support for RPC over AF_LOCAL transportsChuck Lever2011-05-272-3/+400
| * | | | | SUNRPC: Remove obsolete commentChuck Lever2011-05-271-4/+0
| * | | | | SUNRPC: Use AF_LOCAL for rpcbind upcallsChuck Lever2011-05-272-14/+85
| * | | | | SUNRPC: Clean up use of curly braces in switch casesChuck Lever2011-05-271-9/+8
| * | | | | SUNRPC: Rename xs_encode_tcp_fragment_header()Chuck Lever2011-05-271-12/+12
| * | | | | SUNRPC: Deal with the lack of a SYN_SENT sk->sk_state_change callback...Trond Myklebust2011-05-271-3/+13
| | |/ / / | |/| | |
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-05-2711-35/+92
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | net: Kill ratelimit.h dependency in linux/net.hDavid S. Miller2011-05-272-0/+2
| * | | | inetpeer: fix race in unused_list manipulationsEric Dumazet2011-05-271-15/+27
| * | | | atm: expose ATM device index in sysfsDan Williams2011-05-271-0/+10
| * | | | Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6David S. Miller2011-05-273-11/+24
| |\ \ \ \
| | * | | | IPVS: bug in ip_vs_ftp, same list heaad used in all netns.Hans Schillstrom2011-05-271-8/+19
| | * | | | netfilter: Fix several warnings in compat_mtw_from_user().David Miller2011-05-261-2/+4
| | * | | | netfilter: ipset: fix ip_set_flush return codeJozsef Kadlecsik2011-05-261-1/+1
| * | | | | bug.h: Move ratelimit warn interfaces to ratelimit.hDavid S. Miller2011-05-261-0/+1
| * | | | | net:8021q:vlan.c Fix pr_info to just give the vlan fullname and version.Justin Mattock2011-05-261-4/+1
| * | | | | can: convert to %pK for kptr_restrict supportOliver Hartkopp2011-05-261-4/+3
| * | | | | net: fix ETHTOOL_SFEATURES compatibility with old ethtool_ops.set_flagsMichał Mirosław2011-05-261-1/+24
* | | | | | Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6Linus Torvalds2011-05-271-1/+1
|\ \ \ \ \ \
| * | | | | | [S390] irq: merge irq.c and s390_ext.cHeiko Carstens2011-05-261-1/+1
* | | | | | | Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmare...Linus Torvalds2011-05-262-2/+2
|\ \ \ \ \ \ \
| * | | | | | | atm: Drop __TIME__ usageMichal Marek2011-05-262-2/+2
View Lorry Controller Status