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: d446034 dc03a60)

author	Thierry Reding <treding@nvidia.com>
	Thu, 24 Oct 2013 12:33:34 +0000 (14:33 +0200)
committer	Thierry Reding <treding@nvidia.com>
	Thu, 24 Oct 2013 12:33:34 +0000 (14:33 +0200)
commit	434387e4b7b66bde495bef5c0d14998b5b3db550
tree	3ab80703e6401309f4b3b72c06f37d4924960621	tree \| snapshot
parent	d44603433d42a035594d1e5dd2e29ddf23660e05	commit \| diff
parent	dc03a60dfcfff1c1f3c02dfd15b0dec23dfc7269	commit \| diff

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

Conflicts:
fs/nfs/direct.c
fs/nfs/file.c

14 files changed:

fs/9p/vfs_file.c	diff1 \|	diff2 \|	blob \| history
fs/9p/vfs_inode.c	diff1 \|	diff2 \|	blob \| history
fs/9p/vfs_inode_dotl.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ctree.h	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ioctl.c	diff1 \|	diff2 \|	blob \| history
fs/cifs/cifsfs.c	diff1 \|	diff2 \|	blob \| history
fs/cifs/cifsfs.h	diff1 \|	diff2 \|	blob \| history
fs/gfs2/inode.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/dir.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/direct.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/file.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/nfs4file.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/nfs4proc.c	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules