git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 May 2014 00:44:58 +0000 (10:44 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 May 2014 00:44:58 +0000 (10:44 +1000)
commit	d3a1c5342a40617c2f1cced13343741dddb063df
tree	7e490096da00087e2ddc1e49256365cfa3f51006	tree \| snapshot
parent	fe3775cc7ec6af859b067334d3c852d775e3b693	commit \| diff
parent	9bd0bc947d9549d13ecfc03454638f7c5c66154a	commit \| diff

Merge remote-tracking branch 'vfs/for-next'

Conflicts:
fs/ext4/file.c
fs/f2fs/file.c
fs/nfs/direct.c
fs/splice.c

26 files changed:

drivers/staging/lustre/lustre/llite/file.c	diff1 \|	diff2 \|	blob \| history
fs/9p/vfs_file.c	diff1 \|	diff2 \|	blob \| history
fs/afs/internal.h	diff1 \|	diff2 \|	blob \| history
fs/cifs/cifsfs.c	diff1 \|	diff2 \|	blob \| history
fs/cifs/cifsfs.h	diff1 \|	diff2 \|	blob \| history
fs/cifs/file.c	diff1 \|	diff2 \|	blob \| history
fs/ecryptfs/file.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/ext4.h	diff1 \|	diff2 \|	blob \| history
fs/ext4/file.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/inode.c	diff1 \|	diff2 \|	blob \| history
fs/f2fs/data.c	diff1 \|	diff2 \|	blob \| history
fs/f2fs/file.c	diff1 \|	diff2 \|	blob \| history
fs/fuse/file.c	diff1 \|	diff2 \|	blob \| history
fs/gfs2/aops.c	diff1 \|	diff2 \|	blob \| history
fs/gfs2/file.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/direct.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/file.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/internal.h	diff1 \|	diff2 \|	blob \| history
fs/nfs/nfs4file.c	diff1 \|	diff2 \|	blob \| history
fs/splice.c	diff1 \|	diff2 \|	blob \| history
fs/ubifs/file.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_aops.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_file.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_trace.h	diff1 \|	diff2 \|	blob \| history
include/linux/nfs_fs.h	diff1 \|	diff2 \|	blob \| history
mm/filemap.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

drivers/staging/lustre/lustre/llite/file.c	diff1 \|	diff2 \|	blob \| history
fs/9p/vfs_file.c	diff1 \|	diff2 \|	blob \| history
fs/afs/internal.h	diff1 \|	diff2 \|	blob \| history
fs/cifs/cifsfs.c	diff1 \|	diff2 \|	blob \| history
fs/cifs/cifsfs.h	diff1 \|	diff2 \|	blob \| history
fs/cifs/file.c	diff1 \|	diff2 \|	blob \| history
fs/ecryptfs/file.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/ext4.h	diff1 \|	diff2 \|	blob \| history
fs/ext4/file.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/inode.c	diff1 \|	diff2 \|	blob \| history
fs/f2fs/data.c	diff1 \|	diff2 \|	blob \| history
fs/f2fs/file.c	diff1 \|	diff2 \|	blob \| history
fs/fuse/file.c	diff1 \|	diff2 \|	blob \| history
fs/gfs2/aops.c	diff1 \|	diff2 \|	blob \| history
fs/gfs2/file.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/direct.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/file.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/internal.h	diff1 \|	diff2 \|	blob \| history
fs/nfs/nfs4file.c	diff1 \|	diff2 \|	blob \| history
fs/splice.c	diff1 \|	diff2 \|	blob \| history
fs/ubifs/file.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_aops.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_file.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_trace.h	diff1 \|	diff2 \|	blob \| history
include/linux/nfs_fs.h	diff1 \|	diff2 \|	blob \| history
mm/filemap.c	diff1 \|	diff2 \|	blob \| history