summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* net: fix /proc/net/dev regressionEric Dumazet2012-04-032-46/+15
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-04-0210-38/+64
|\
| * ipv6: Fix RTM_GETROUTE's interpretation of RTA_IIF to be consistent with ipv4Shmulik Ladkani2012-04-011-7/+27
| * net/netfilter/nfnetlink_acct.c: use linux/atomic.hAndrew Morton2012-04-011-1/+1
| * rose_dev: fix memcpy-bug in rose_set_mac_addressdanborkmann@iogearbox.net2012-04-011-2/+2
| * net/garp: avoid infinite loop if attribute already existsDavid Ward2012-04-011-12/+10
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2012-04-011-1/+1
| |\
| | * mac80211: fix oper channel timestamp updationRajkumar Manoharan2012-03-281-1/+1
| * | net/core: dev_forward_skb() should clear skb_iifBenjamin LaHaise2012-03-281-0/+1
| * | net/ipv4: fix IPv4 multicast over network namespacesBenjamin LaHaise2012-03-281-1/+1
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2012-03-273-14/+21
| |\ \ | | |/
| | * mac80211: fix possible tid_rx->reorder_timer use after freeStanislaw Gruszka2012-03-261-1/+2
| | * mac80211: remove outdated commentEliad Peller2012-03-261-3/+0
| | * cfg80211: allow CFG80211_SIGNAL_TYPE_UNSPEC in station_infoJohn W. Linville2012-03-261-10/+19
* | | Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2012-03-293-36/+50
|\ \ \
| * | | compat: Handle COMPAT_USE_64BIT_TIME in net/socket.cH. Peter Anvin2012-02-201-10/+8
| * | | compat: Use COMPAT_USE_64BIT_TIME in net/compat.cH. J. Lu2012-02-201-25/+40
| * | | compat: Use COMPAT_USE_64BIT_TIME in the Bluetooth subsystemH. J. Lu2012-02-201-1/+2
* | | | Merge branch 'for-3.4' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2012-03-2911-83/+59
|\ \ \ \
| * | | | sunrpc: skip portmap calls on sessions backchannelJ. Bruce Fields2012-03-261-0/+1
| * | | | sunrpc: create nfsd dir in rpc_pipefsJeff Layton2012-03-261-0/+5
| * | | | Merge nfs containerization work from Trond's treeJ. Bruce Fields2012-03-2628-733/+1559
| |\ \ \ \
| * | | | | svcrdma: Cleanup sparse warnings in the svcrdma moduleTom Tucker2012-02-176-80/+50
| * | | | | SUNPRC: remove marking service temporary sockets with XPT_CHNGBUFStanislav Kinsbursky2012-02-031-2/+0
| * | | | | nfsd: remove some unneeded checksDan Carpenter2012-02-031-1/+1
| * | | | | nfsd: don't allow zero length strings in cache_parse()Dan Carpenter2012-02-031-0/+2
* | | | | | Merge tag 'nfs-for-3.4-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2012-03-281-1/+1
|\ \ \ \ \ \
| * | | | | | SUNRPC: Use the already looked-up xprt in rpcb_getport_async()Bryan Schumaker2012-03-271-1/+1
* | | | | | | Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub...Linus Torvalds2012-03-2893-93/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove all #inclusions of asm/system.hDavid Howells2012-03-2893-93/+0
* | | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2012-03-283-230/+255
|\ \ \ \ \ \ \ \
| * | | | | | | | libceph: isolate kmap() call in write_partial_msg_pages()Alex Elder2012-03-221-11/+2
| * | | | | | | | libceph: rename "page_shift" variable to something sensibleAlex Elder2012-03-221-5/+6
| * | | | | | | | libceph: get rid of zero_page_addressAlex Elder2012-03-221-9/+2
| * | | | | | | | libceph: only call kernel_sendpage() via helperAlex Elder2012-03-221-6/+2
| * | | | | | | | libceph: use kernel_sendpage() for sending zeroesAlex Elder2012-03-221-5/+15
| * | | | | | | | libceph: fix inverted crc option logicAlex Elder2012-03-221-10/+10
| * | | | | | | | libceph: some simple changesAlex Elder2012-03-221-4/+9
| * | | | | | | | libceph: small refactor in write_partial_kvec()Alex Elder2012-03-221-11/+12
| * | | | | | | | libceph: do crc calculations outside loopAlex Elder2012-03-221-14/+12
| * | | | | | | | libceph: separate CRC calculation from byte swappingAlex Elder2012-03-221-14/+17
| * | | | | | | | libceph: use "do" in CRC-related Boolean variablesAlex Elder2012-03-221-20/+20
| * | | | | | | | ceph: ensure Boolean options support both sensesAlex Elder2012-03-221-0/+10
| * | | | | | | | libceph: a few small changesAlex Elder2012-03-221-14/+18
| * | | | | | | | libceph: make ceph_tcp_connect() return intAlex Elder2012-03-221-8/+6
| * | | | | | | | libceph: encapsulate some messenger cleanup codeAlex Elder2012-03-221-18/+20
| * | | | | | | | libceph: make ceph_msgr_wq privateAlex Elder2012-03-221-1/+1
| * | | | | | | | libceph: encapsulate connection kvec operationsAlex Elder2012-03-221-61/+56
| * | | | | | | | libceph: move prepare_write_banner()Alex Elder2012-03-221-3/+4
| * | | | | | | | rbd: make ceph_parse_options() return a pointerAlex Elder2012-03-221-8/+8
OpenPOWER on IntegriCloud