]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'vfs/for-next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:33:34 +0000 (14:33 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:33:34 +0000 (14:33 +0200)
commit434387e4b7b66bde495bef5c0d14998b5b3db550
tree3ab80703e6401309f4b3b72c06f37d4924960621
parentd44603433d42a035594d1e5dd2e29ddf23660e05
parentdc03a60dfcfff1c1f3c02dfd15b0dec23dfc7269
Merge remote-tracking branch 'vfs/for-next'

Conflicts:
fs/nfs/direct.c
fs/nfs/file.c
14 files changed:
fs/9p/vfs_file.c
fs/9p/vfs_inode.c
fs/9p/vfs_inode_dotl.c
fs/btrfs/ctree.h
fs/btrfs/ioctl.c
fs/cifs/cifsfs.c
fs/cifs/cifsfs.h
fs/gfs2/inode.c
fs/nfs/dir.c
fs/nfs/direct.c
fs/nfs/file.c
fs/nfs/nfs4file.c
fs/nfs/nfs4proc.c
include/linux/fs.h