aboutsummaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2010-10-211-1/+1
|\
| * sched: Fix softirq time accountingVenkatesh Pallipadi2010-10-181-1/+1
* | Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2010-10-214-0/+11
|\ \
| * \ Merge commit 'v2.6.36-rc7' into perf/coreIngo Molnar2010-10-0837-152/+221
| |\ \
| * \ \ Merge commit 'v2.6.36-rc5' into perf/coreIngo Molnar2010-09-2115-87/+96
| |\ \ \
| * \ \ \ Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git...Ingo Molnar2010-09-1536-244/+293
| |\ \ \ \
| * | | | | skb: Add tracepoints to freeing skbKoki Sanagi2010-09-073-0/+4
| * | | | | netdev: Add tracepoints to netdev layerKoki Sanagi2010-09-072-0/+7
* | | | | | Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2010-10-218-10/+13
|\ \ \ \ \ \
| * | | | | | net: suppress RCU lockdep false positive in sock_update_classidPaul E. McKenney2010-10-071-1/+4
| * | | | | | Merge commit 'v2.6.36-rc7' into core/rcuIngo Molnar2010-10-0768-416/+500
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/pa...Ingo Molnar2010-10-0726-102/+143
| |\ \ \ \ \ \
| * | | | | | | net/netfilter: __rcu annotationsArnd Bergmann2010-08-197-9/+9
* | | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2010-10-215-33/+103
|\ \ \ \ \ \ \ \
| * | | | | | | | secmark: fix config problem when CONFIG_NF_CONNTRACK_SECMARK is not setEric Paris2010-10-211-0/+2
| * | | | | | | | secmark: export secctx, drop secmark in procfsEric Paris2010-10-212-6/+50
| * | | | | | | | conntrack: export lsm context rather than internal secid via netlinkEric Paris2010-10-211-10/+36
| * | | | | | | | secmark: make secmark object handling genericEric Paris2010-10-212-19/+17
| * | | | | | | | secmark: do not return early if there was no errorEric Paris2010-10-211-1/+1
* | | | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2010-10-2129-0/+10750
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | ceph: fix num_pages_free accounting in pagelistSage Weil2010-10-201-0/+1
| * | | | | | | | ceph: don't crash when passed bad mount optionsYehuda Sadeh2010-10-201-1/+1
| * | | | | | | | ceph: add pagelist_reserve, pagelist_truncate, pagelist_set_cursorGreg Farnum2010-10-201-9/+97
| * | | | | | | | rbd: introduce rados block device (rbd), based on libcephYehuda Sadeh2010-10-201-2/+1
| * | | | | | | | ceph: factor out libceph from Ceph file systemYehuda Sadeh2010-10-2029-0/+10662
* | | | | | | | | De-pessimize rds_page_copy_userLinus Torvalds2010-10-151-20/+7
|/ / / / / / / /
* | | | | | | | net: clear heap allocations for privileged ethtool actionsKees Cook2010-10-111-3/+3
* | | | | | | | ATM: mpc, fix use after freeJiri Slaby2010-10-111-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | net: clear heap allocation for ETHTOOL_GRXCLSRLALLKees Cook2010-10-081-1/+1
* | | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-10-082-2/+4
|\ \ \ \ \ \ \
| * | | | | | | Revert "mac80211: use netif_receive_skb in ieee80211_tx_status callpath"John W. Linville2010-10-071-2/+2
| * | | | | | | mac80211: delete AddBA response timerJohannes Berg2010-10-061-0/+2
* | | | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padova...David S. Miller2010-10-072-33/+33
|\ \ \ \ \ \ \ \
| * | | | | | | | Bluetooth: Disallow to change L2CAP_OPTIONS values when connectedGustavo F. Padovan2010-10-041-0/+5
| * | | | | | | | Revert "Bluetooth: Don't accept ConfigReq if we aren't in the BT_CONFIG state"Gustavo F. Padovan2010-09-301-7/+1
| * | | | | | | | Bluetooth: Fix inconsistent lock state with RFCOMMGustavo F. Padovan2010-09-301-0/+4
| * | | | | | | | Bluetooth: Simplify L2CAP Streaming mode sendingGustavo F. Padovan2010-09-301-17/+7
| * | | | | | | | Bluetooth: fix MTU L2CAP configuration parameterAndrei Emeltchenko2010-09-301-3/+3
| * | | | | | | | Bluetooth: Only enable L2CAP FCS for ERTM or streamingMat Martineau2010-09-301-6/+13
* | | | | | | | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds...David S. Miller2010-10-068-88/+110
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-10-045-19/+27
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-09-2831-122/+176
| |\ \ \ \ \ \ \ \
| * | | | | | | | | net/9p: fix memory handling/allocation in rdma_request()Davidlohr Bueso2010-09-271-11/+18
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-09-199-11/+10
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6Linus Torvalds2010-09-146-76/+86
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | sunrpc: increase MAX_HASHTABLE_BITS to 14Miquel van Smoorenburg2010-09-121-1/+1
| | * | | | | | | | gss:spkm3 miss returning error to caller when import security contextBian Naimeng2010-09-121-1/+4
| | * | | | | | | | gss:krb5 miss returning error to caller when import security contextBian Naimeng2010-09-121-2/+8
| | * | | | | | | | SUNRPC: cleanup state-machine orderingJ. Bruce Fields2010-09-121-42/+42
| | * | | | | | | | SUNRPC: Fix a race in rpc_info_openTrond Myklebust2010-09-122-20/+20