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

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

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: af53f8d 9bd0bc9)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 16 May 2014 01:07:19 +0000 (11:07 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 16 May 2014 01:07:19 +0000 (11:07 +1000)
commit	e52bc4327285e60b4d3048e433e22b21d1b04c20
tree	35ff66ff7525916d1629571979b9603386ecce32	tree \| snapshot
parent	af53f8daa77c63685c64f365a5e858ec1c3a474a	commit \| diff
parent	9bd0bc947d9549d13ecfc03454638f7c5c66154a	commit \| diff

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

Conflicts:
fs/cifs/cifsfs.c
fs/f2fs/file.c

18 files changed:

drivers/staging/lustre/lustre/llite/file.c	diff1 \|	diff2 \|	blob \| history
fs/9p/vfs_file.c	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/file.c	diff1 \|	diff2 \|	blob \| history
fs/ubifs/file.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_file.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_trace.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules