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

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

projects / karo-tx-linux.git / commit

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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 21 May 2014 01:08:59 +0000 (11:08 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 21 May 2014 01:08:59 +0000 (11:08 +1000)
commit	f771b5bdd9d1d43588f2f2358834b5a8ff465e55
tree	54d370d3aa0bdb8d77617f582a730197ead2ae69	tree \| snapshot
parent	d1c66b26d83bd16394f8223e4b7978cde3a08598	commit \| diff
parent	9bd0bc947d9549d13ecfc03454638f7c5c66154a	commit \| diff

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

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

19 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_aops.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