summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jac...Linus Torvalds2011-03-186-13/+23
|\
| * Merge branch 'for_next' into for_linusJan Kara2011-03-176-13/+23
| |\
| | * ext3: Always set dx_node's fake_dirent explicitly.Eric Sandeen2011-03-071-1/+1
| | * ext3: Fix an overflow in ext3_trim_fs.Tao Ma2011-03-041-3/+8
| | * jbd: Remove one to many n's in a word.Justin P. Mattock2011-02-282-2/+2
| | * ext3: skip orphan cleanup on rocompat fsAmir Goldstein2011-02-281-0/+7
| | * ext2: Fix link count corruption under heavy link+rename loadJosh Hunt2011-02-281-7/+2
| | * ext3: speed up group trim with the right free block count.Tao Ma2011-02-241-1/+2
| | * ext3: Adjust trim start with first_data_block.Tao Ma2011-02-241-5/+2
| | * quota: return -ENOMEM when memory allocation failsDavidlohr Bueso2011-02-241-1/+1
* | | Merge branch 'nfs-for-2.6.39' of git://git.linux-nfs.org/projects/trondmy/nfs...Linus Torvalds2011-03-1840-800/+1600
|\ \ \
| * | | RPC: killing RPC tasks races fixedStanislav Kinsbursky2011-03-171-1/+3
| * | | xprt: remove redundant checkj223yang@asset.uwaterloo.ca2011-03-171-1/+1
| * | | SUNRPC: Convert struct rpc_xprt to use atomic_t countersTrond Myklebust2011-03-172-10/+9
| * | | SUNRPC: Ensure we always run the tk_callback before tk_actionTrond Myklebust2011-03-171-8/+6
| * | | sunrpc: fix printk format warningRandy Dunlap2011-03-161-1/+2
| * | | xprt: remove redundant null checkj223yang@asset.uwaterloo.ca2011-03-161-4/+3
| * | | nfs: BKL is no longer needed, so remove the includeStephen Rothwell2011-03-151-1/+0
| * | | NFS: Fix a warning in fs/nfs/idmap.cTrond Myklebust2011-03-141-0/+1
| * | | Cleanup: Factor out some cut-and-paste code.Rob Landley2011-03-111-111/+44
| * | | cleanup: save 60 lines/100 bytes by combining two mostly duplicate functions.Rob Landley2011-03-111-96/+33
| * | | NFS: account direct-io into task io accountingKonstantin Khlebnikov2011-03-111-0/+5
| * | | gss:krb5 only include enctype numbers in gm_upcall_enctypesKevin Coffman2011-03-112-2/+2
| * | | RPCRDMA: Fix FRMR registration/invalidate handling.Tom Tucker2011-03-112-8/+45
| * | | RPCRDMA: Fix to XDR page base interpretation in marshalling logic.Tom Tucker2011-03-111-44/+42
| * | | NFSv4: Send unmapped uid/gids to the server when using auth_sysTrond Myklebust2011-03-115-9/+55
| * | | NFSv4: Propagate the error NFS4ERR_BADOWNER to nfs4_do_setattrTrond Myklebust2011-03-112-2/+3
| * | | NFSv4: cleanup idmapper functions to take an nfs_server argumentTrond Myklebust2011-03-113-26/+25
| * | | NFSv4: Send unmapped uid/gids to the server if the idmapper failsTrond Myklebust2011-03-111-4/+26
| * | | NFSv4: If the server sends us a numeric uid/gid then accept itTrond Myklebust2011-03-111-2/+26
| * | | NFSv4.1: reject zero layout with zeroed stripe unitBenny Halevy2011-03-111-2/+2
| * | | NFSv4.1: Clear lseg pointer in ->doio functionFred Isaman2011-03-113-1/+4
| * | | NFSv4.1: rearrange ->doio argsFred Isaman2011-03-114-39/+45
| * | | NFSv4.1: pnfs filelayout driver writeFred Isaman2011-03-115-2/+128
| * | | NFSv4.1: remove GETATTR from ds writesFred Isaman2011-03-112-4/+10
| * | | NFSv4.1: implement generic pnfs layer write switchAndy Adamson2011-03-116-0/+47
| * | | NFSv4.1: trigger LAYOUTGET for writesFred Isaman2011-03-113-12/+49
| * | | NFSv4.1: Send lseg down into nfs_write_rpcsetupFred Isaman2011-03-112-2/+6
| * | | NFSv4.1: add callback to nfs4_write_doneFred Isaman2011-03-112-4/+11
| * | | NFSv4.1: rearrange nfs_write_rpcsetupAndy Adamson2011-03-111-36/+46
| * | | NFSv4.1: lseg documentationFred Isaman2011-03-111-0/+7
| * | | NFSv4.1: turn off pNFS on ds connection failureAndy Adamson2011-03-114-9/+36
| * | | NFSv4.1 move deviceid cache to filelayout driverChristoph Hellwig2011-03-116-264/+92
| * | | NFSv4.1: filelayout async error handlerAndy Adamson2011-03-118-6/+123
| * | | NFSv4.1: filelayout readAndy Adamson2011-03-116-2/+92
| * | | NFSv4.1: filelayout i/o helpersFred Isaman2011-03-113-0/+108
| * | | NFSv4.1: data server connectionAndy Adamson2011-03-116-2/+147
| * | | NFSv4.1: generic readAndy Adamson2011-03-115-25/+90
| * | | NFSv4.1: shift pnfs_update_layout locationsFred Isaman2011-03-118-37/+51
| * | | NFSv4.1: coelesce across layout stripesFred Isaman2011-03-117-2/+70