summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into for-nextJiri Kosina2012-04-08437-10507/+16142
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-04-0612-74/+71
| |\
| | * net: fix a race in sock_queue_err_skb()Eric Dumazet2012-04-061-1/+3
| | * netlink: fix races after skb queueingEric Dumazet2012-04-061-11/+13
| | * phonet: Check input from user before allocatingSasha Levin2012-04-051-0/+3
| | * tcp: tcp_sendpages() should call tcp_push() onceEric Dumazet2012-04-052-4/+4
| | * ipv6: fix array index in ip6_mc_add_src()RongQing.Li2012-04-051-1/+1
| | * sctp: Allow struct sctp_event_subscribe to grow without breaking binariesThomas Graf2012-04-041-2/+3
| | * netfilter: nf_conntrack: fix count leak in error path of __nf_conntrack_allocPablo Neira Ayuso2012-04-031-0/+1
| | * netfilter: xt_CT: fix missing put timeout object in error pathPablo Neira Ayuso2012-04-031-5/+19
| | * netfilter: xt_CT: allocation has to be GFP_ATOMIC under rcu_read_lock sectionPablo Neira Ayuso2012-04-031-1/+1
| | * Merge branch 'master' of git://1984.lsi.us.es/netDavid S. Miller2012-04-031-0/+2
| | |\
| | | * netfilter: xt_CT: remove a compile warningPablo Neira Ayuso2012-04-031-0/+2
| | * | bpf jit: Make the filter.c::__load_pointer helper non-static for the jitsJan Seiffert2012-04-031-3/+6
| | * | tcp: allow splice() to build full TSO packetsEric Dumazet2012-04-031-1/+1
| | * | net: fix /proc/net/dev regressionEric Dumazet2012-04-032-46/+15
| * | | Merge branch 'akpm' (Andrew's patch-bomb)Linus Torvalds2012-04-057-24/+11
| |\ \ \ | | |/ / | |/| |
| | * | simple_open: automatically convert to simple_open()Stephen Boyd2012-04-057-24/+11
| * | | 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
OpenPOWER on IntegriCloud