aboutsummaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-10-143-27/+28
|\
| * KEYS: Add payload preparsing opportunity prior to key instantiate or updateDavid Howells2012-10-083-27/+28
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebi...Linus Torvalds2012-10-131-1/+1
|\ \
| * | userns: Properly print bluetooth socket uidsEric W. Biederman2012-10-121-1/+1
* | | Merge branch 'for-3.7' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2012-10-133-204/+190
|\ \ \
| * \ \ Merge Trond's bugfixesJ. Bruce Fields2012-10-111-5/+17
| |\ \ \
| * \ \ \ nfs: disintegrate UAPI for nfsJ. Bruce Fields2012-10-09438-8900/+16221
| |\ \ \ \
| * | | | | nfsd: remove unused listener-removal interfacesJ. Bruce Fields2012-09-101-51/+0
| * | | | | svcrpc: split up svc_handle_xprtJ. Bruce Fields2012-08-211-22/+25
| * | | | | svcrpc: break up svc_recvJ. Bruce Fields2012-08-211-36/+67
| * | | | | svcrpc: make svc_xprt_received staticJ. Bruce Fields2012-08-212-25/+20
| * | | | | svcrpc: make xpo_recvfrom return only >=0J. Bruce Fields2012-08-212-4/+4
| * | | | | svcrpc: don't bother checking bad svc_addr_len resultJ. Bruce Fields2012-08-211-2/+0
| * | | | | svcrpc: minor udp code cleanupJ. Bruce Fields2012-08-211-4/+5
| * | | | | svcrpc: share some setup of listening socketsJ. Bruce Fields2012-08-212-11/+11
| * | | | | svcrpc: make svc_create_xprt enqueue on clearing XPT_BUSYJ. Bruce Fields2012-08-211-1/+1
| * | | | | svcrpc: clean up control flowJ. Bruce Fields2012-08-211-35/+34
| * | | | | svcrpc: standardize svc_setup_socket return conventionJ. Bruce Fields2012-08-211-18/+22
| * | | | | svcrpc: fix xpt_list traversal locking on shutdownJ. Bruce Fields2012-08-211-9/+15
* | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-10-1311-138/+82
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | net: add doc for in4_pton()Amerigo Wang2012-10-121-0/+12
| * | | | | net: add doc for in6_pton()Amerigo Wang2012-10-121-0/+12
| * | | | | vti: fix sparse bit endian warningsstephen hemminger2012-10-121-2/+2
| * | | | | tcp: resets are misroutedAlexey Kuznetsov2012-10-122-4/+6
| * | | | | tcp: sysctl interface leaks 16 bytes of kernel memoryAlan Cox2012-10-111-0/+2
| * | | | | ipv4: fix route mark sparse warningstephen hemminger2012-10-101-1/+1
| * | | | | bridge: Pull ip header into skb->data before looking into ip header.Sarveshwar Bandi2012-10-101-0/+3
| * | | | | pktgen: replace scan_ip6() with in6_pton()Amerigo Wang2012-10-101-97/+4
| * | | | | pktgen: enable automatic IPv6 address settingAmerigo Wang2012-10-101-13/+5
| * | | | | pktgen: display IPv4 address in human-readable formatAmerigo Wang2012-10-101-2/+2
| * | | | | pktgen: set different default min_pkt_size for different protocolsAmerigo Wang2012-10-101-7/+20
| * | | | | pktgen: fix crash when generating IPv6 packetsAmerigo Wang2012-10-101-1/+1
| * | | | | Merge tag 'master-2012-10-08' of git://git.kernel.org/pub/scm/linux/kernel/gi...David S. Miller2012-10-103-14/+15
| |\ \ \ \ \
| | * | | | | mac80211: use ieee80211_free_txskb to fix possible skb leaksFelix Fietkau2012-10-082-12/+14
| | * | | | | mac80211: call drv_get_tsf() in sleepable contextThomas Pedersen2012-10-081-2/+1
* | | | | | | Merge tag 'for-linus-merge-3.7' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2012-10-122-20/+36
|\ \ \ \ \ \ \
| * | | | | | | 9P: Fix race between p9_write_work() and p9_fd_request()Simon Derr2012-10-111-1/+2
| * | | | | | | 9P: Fix race in p9_write_work()Simon Derr2012-09-171-9/+10
| * | | | | | | 9P: fix test at the end of p9_write_work()Simon Derr2012-09-171-1/+1
| * | | | | | | 9P: Fix race in p9_read_work()Simon Derr2012-09-171-7/+7
| * | | | | | | net/9p: Check errno validitySimon Derr2012-09-061-2/+16
* | | | | | | | Merge tag 'nfs-for-3.7-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2012-10-108-125/+139
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | SUNRPC: Introduce rpc_clone_client_set_auth()Chuck Lever2012-10-011-0/+22
| * | | | | | | SUNRPC: Refactor rpc_clone_client()Chuck Lever2012-10-011-40/+43
| * | | | | | | SUNRPC: Use __func__ in dprintk() in auth_gss.cChuck Lever2012-10-011-29/+29
| * | | | | | | SUNRPC: Clean up dprintk messages in rpc_pipe.cChuck Lever2012-10-011-4/+4
| * | | | | | | SUNRPC: Limit the rpciod workqueue concurrencyTrond Myklebust2012-09-281-1/+1
| * | | | | | | SUNRPC: Get rid of the redundant xprt->shutdown bit fieldTrond Myklebust2012-09-283-38/+10
| * | | | | | | SUNRPC: Optimise away unnecessary data moves in xdr_align_pagesTrond Myklebust2012-09-281-10/+13
| * | | | | | | SUNRPC: Fix the return value of xdr_align_pages()Trond Myklebust2012-09-261-0/+2
| | |_|_|_|/ / | |/| | | | |