summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'nfs-for-3.15-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2014-04-066-68/+93
|\
| * SUNRPC: rpc_restart_call/rpc_restart_call_prepare should clear task->tk_statusTrond Myklebust2014-03-201-0/+2
| * SUNRPC: Don't let rpc_delay() clobber non-timeout errorsTrond Myklebust2014-03-201-1/+2
| * SUNRPC: Ensure call_connect_status() deals correctly with SOFTCONN tasksSteve Dickson2014-03-201-2/+2
| * SUNRPC: Ensure call_status() deals correctly with SOFTCONN tasksTrond Myklebust2014-03-191-0/+4
| * SUNRPC: remove KERN_INFO from dprintk() call sitesChuck Lever2014-03-171-5/+5
| * SUNRPC: Fix large reads on NFS/RDMAChuck Lever2014-03-171-3/+1
| * Merge branch 'devel' into linux-nextTrond Myklebust2014-03-173-57/+77
| |\
| | * SUNRPC: Ensure that call_bind times out correctlyTrond Myklebust2014-03-171-3/+2
| | * SUNRPC: Ensure that call_connect times out correctlyTrond Myklebust2014-03-171-5/+3
| | * SUNRPC: RPC callbacks may be split across several TCP segmentsTrond Myklebust2014-02-112-49/+72
* | | Merge branch 'for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/c...Linus Torvalds2014-04-034-51/+11
|\ \ \
| * | | cgroup: drop const from @buffer of cftype->write_string()Tejun Heo2014-03-192-2/+2
| * | | cgroup: drop @skip_css from cgroup_taskset_for_each()Tejun Heo2014-02-132-2/+2
| * | | cgroup: clean up cgroup_subsys names and initializationTejun Heo2014-02-083-8/+4
| * | | cgroup: drop module supportTejun Heo2014-02-082-2/+0
| * | | cgroup: make CONFIG_CGROUP_NET_PRIO bool and drop unnecessary init_netclassid...Tejun Heo2014-02-083-37/+3
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2014-04-02342-7311/+15444
|\ \ \ \
| * | | | netpoll: Use skb_irq_freeable to make zap_completion_queue safe.Eric W. Biederman2014-04-011-1/+1
| * | | | net: ptp: move PTP classifier in its own fileDaniel Borkmann2014-04-015-21/+148
| * | | | mac802154: make csma/cca parameters per-wpanPhoebe Buckheister2014-04-019-235/+234
| * | | | mac802154: allow only one WPAN to be up at any given timePhoebe Buckheister2014-04-012-0/+26
| * | | | net: filter: minor: fix kdoc in __sk_run_filterDaniel Borkmann2014-04-011-2/+2
| * | | | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2014-03-316-77/+106
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2014-03-316-77/+106
| | |\ \ \ \
| | | * \ \ \ Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-03-276-77/+106
| | | |\ \ \ \
| | | | * | | | Bluetooth: Fix returning peer address in pending connect stateJohan Hedberg2014-03-262-2/+4
| | | | * | | | Bluetooth: Remove unnecessary assignment in SMPJohan Hedberg2014-03-241-2/+0
| | | | * | | | Bluetooth: Fix potential NULL pointer dereference in smp_conn_securityJohan Hedberg2014-03-241-1/+1
| | | | * | | | Bluetooth: Remove LTK re-encryption procedureJohan Hedberg2014-03-242-49/+7
| | | | * | | | Bluetooth: Don't try to confirm locally initiated SMP pairingJohan Hedberg2014-03-241-0/+5
| | | | * | | | Bluetooth: Add SMP flag to track which side is the initiatorJohan Hedberg2014-03-242-0/+7
| | | | * | | | Bluetooth: Fix SMP confirmation callback handlingJohan Hedberg2014-03-241-0/+4
| | | | * | | | Bluetooth: Add missing cmd_status handler for LE_Start_EncryptionJohan Hedberg2014-03-241-0/+34
| | | | * | | | Bluetooth: Fix potential NULL pointer dereference in SMPJohan Hedberg2014-03-241-1/+7
| | | | * | | | Bluetooth: Track current configured LE scan type parameterMarcel Holtmann2014-03-211-0/+25
| | | | * | | | Bluetooth: Fix address value for early disconnection eventsJohan Hedberg2014-03-202-21/+11
| | | | * | | | Bluetooth: Fix passkey endianess in user_confirm and notify_passkeyJohan Hedberg2014-03-193-5/+5
| * | | | | | | ipv6: some ipv6 statistic counters failed to disable bhHannes Frederic Sowa2014-03-314-10/+11
| * | | | | | | ipv6: strengthen fallback fragmentation id generationHannes Frederic Sowa2014-03-311-12/+15
| * | | | | | | net-gro: restore frag0 optimizationEric Dumazet2014-03-311-32/+64
| * | | | | | | rds: prevent dereference of a NULL device in rds_iw_laddr_checkSasha Levin2014-03-311-1/+2
| * | | | | | | net-sysfs: expose number of carrier on/off changesdavid decotigny2014-03-313-1/+18
| * | | | | | | ipv6: tcp_ipv6 policy route issueWang Yufen2014-03-311-7/+11
| * | | | | | | ipv6: reuse rt6_need_strictWang Yufen2014-03-311-6/+0
| * | | | | | | ipv6: tcp_ipv6 do some cleanupWang Yufen2014-03-311-13/+11
| * | | | | | | bridge: use is_skb_forwardable in forward pathVlad Yasevich2014-03-311-7/+2
| * | | | | | | net: Allow modules to use is_skb_forwardableVlad Yasevich2014-03-311-2/+2
| |/ / / / / /
| * | | | | | net: filter: rework/optimize internal BPF interpreter's instruction setAlexei Starovoitov2014-03-311-300/+1157
| * | | | | | net: ptp: do not reimplement PTP/BPF classifierDaniel Borkmann2014-03-311-1/+7