]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'userns/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 05:27:27 +0000 (16:27 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 05:27:27 +0000 (16:27 +1100)
commit0099596141b0011d728236b7b8249caf0ca3bcb5
treeef5d4ce38e28023389dba70d87a4130345c2c6b2
parent157d0a623768fbab7152e3cf4f4f10c8375531f6
parent139321c65c0584cd65c4c87a5eb3fdb4fdbd0e19
Merge remote-tracking branch 'userns/for-next'

Conflicts:
net/sunrpc/svcauth_unix.c
29 files changed:
fs/9p/vfs_inode.c
fs/9p/vfs_inode_dotl.c
fs/ceph/caps.c
fs/ceph/mds_client.c
fs/ceph/mds_client.h
fs/cifs/cifsfs.c
fs/cifs/cifsglob.h
fs/cifs/cifssmb.c
fs/cifs/connect.c
fs/cifs/file.c
fs/gfs2/bmap.c
fs/gfs2/dir.c
fs/gfs2/incore.h
fs/gfs2/inode.c
fs/gfs2/quota.c
fs/gfs2/super.c
fs/gfs2/sys.c
fs/gfs2/xattr.c
fs/nfs/inode.c
fs/nfsd/export.c
fs/nfsd/nfs4idmap.c
fs/nfsd/nfs4recover.c
fs/nfsd/nfs4state.c
fs/nfsd/nfs4xdr.c
init/Kconfig
mm/shmem.c
net/sunrpc/auth_gss/auth_gss.c
net/sunrpc/auth_gss/svcauth_gss.c
net/sunrpc/svcauth_unix.c