summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-05-3114-61/+122
|\
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-05-303-8/+9
| |\
| | * mac80211: fix ADDBA declined after suspend with wowlanEyal Shapira2012-05-291-6/+6
| | * mac80211: fix flag check for QoS NOACK framesClaudio Pisa2012-05-291-1/+1
| | * mac80211: Fix race in checking AP status by sending null frameSoumik Das2012-05-251-1/+2
| * | drop_monitor: Add module alias to enable automatic module loadingNeil Horman2012-05-291-0/+1
| * | genetlink: Build a generic netlink family module aliasNeil Horman2012-05-292-3/+2
| * | rds_rdma: don't assume infiniband device is PCIThadeu Lima de Souza Cascardo2012-05-291-2/+1
| * | l2tp: fix oops in L2TP IP sockets for connect() AF_UNSPEC caseJames Chapman2012-05-292-3/+39
| * | ipv6: fix incorrect ipsec fragmentGao feng2012-05-272-18/+53
| * | xfrm: take net hdr len into account for esp payload size calculationBenjamin Poirier2012-05-272-26/+16
| * | net/wanrouter: Deprecate and schedule for removalJoe Perches2012-05-241-1/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-clientLinus Torvalds2012-05-307-276/+235
|\ \ \
| * | | libceph: fix pg_temp updatesSage Weil2012-05-211-1/+5
| * | | libceph: avoid unregistering osd request when not registeredSage Weil2012-05-181-0/+6
| * | | ceph: add auth buf in prepare_write_connect()Alex Elder2012-05-181-9/+9
| * | | ceph: rename prepare_connect_authorizer()Alex Elder2012-05-171-6/+7
| * | | ceph: return pointer from prepare_connect_authorizer()Alex Elder2012-05-171-9/+9
| * | | ceph: use info returned by get_authorizerAlex Elder2012-05-172-14/+8
| * | | ceph: have get_authorizer methods return pointersAlex Elder2012-05-172-11/+16
| * | | ceph: ensure auth ops are defined before useAlex Elder2012-05-171-5/+10
| * | | ceph: messenger: reduce args to create_authorizerAlex Elder2012-05-173-32/+26
| * | | ceph: define ceph_auth_handshake typeAlex Elder2012-05-171-16/+16
| * | | ceph: messenger: check return from get_authorizerAlex Elder2012-05-171-3/+7
| * | | ceph: messenger: rework prepare_connect_authorizer()Alex Elder2012-05-171-9/+19
| * | | ceph: messenger: check prepare_write_connect() resultAlex Elder2012-05-171-4/+12
| * | | ceph: don't set WRITE_PENDING too earlyAlex Elder2012-05-171-1/+5
| * | | ceph: drop msgr argument from prepare_write_connect()Alex Elder2012-05-171-14/+11
| * | | ceph: messenger: send banner in process_connect()Alex Elder2012-05-171-9/+7
| * | | ceph: messenger: reset connection kvec callerAlex Elder2012-05-171-1/+5
| * | | libceph: don't reset kvec in prepare_write_banner()Alex Elder2012-05-171-3/+1
| * | | ceph: messenger: change read_partial() to take "end" argAlex Elder2012-05-141-22/+38
| * | | ceph: messenger: update "to" in read_partial() callerAlex Elder2012-05-141-15/+16
| * | | ceph: messenger: use read_partial() in read_partial_message()Alex Elder2012-05-141-20/+10
| * | | ceph: osd_client: fix endianness bug in osd_req_encode_op()Alex Elder2012-05-141-1/+1
| * | | crush: warn on do_rule failureSage Weil2012-05-071-4/+11
| * | | crush: fix memory leak when destroying tree bucketsSage Weil2012-05-071-0/+2
| * | | crush: fix tree node weight lookupSage Weil2012-05-071-3/+1
| * | | crush: remove parent mapsSage Weil2012-05-072-32/+0
| * | | crush: remove forcefeed functionalitySage Weil2012-05-072-48/+2
| * | | crush: use a temporary variable to simplify crush_do_ruleSage Weil2012-05-071-9/+11
| * | | crush: be more tolerant of nonsensical crush mapsSage Weil2012-05-071-9/+24
| * | | crush: adjust local retry thresholdSage Weil2012-05-071-1/+1
| * | | crush: clean up types, const-nessSage Weil2012-05-072-19/+20
| * | | ceph: drop support for preferred_osd pgsSage Weil2012-05-071-37/+10
* | | | memcg: decrement static keys at real destroy timeGlauber Costa2012-05-291-7/+27
* | | | Merge tag 'nfs-for-3.5-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2012-05-294-9/+12
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'bugfixes' into nfs-for-nextTrond Myklebust2012-05-2140-186/+307
| |\ \ \
| | * | | sunrpc: fix loss of task->tk_status after rpc_delay call in xprt_alloc_slotTrond Myklebust2012-05-192-2/+5
| | * | | sunrpc: suppress page allocation warnings in xprt_alloc_slot()Jeff Layton2012-05-161-1/+1