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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 19 Sep 2013 01:06:04 +0000 (11:06 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 19 Sep 2013 01:06:04 +0000 (11:06 +1000)
commit	8d31a383b952819ec5db9c1917c01735db77a2d1
tree	569da893d6cc926d4160ef6cbff59f4e23c67cda	tree \| snapshot
parent	da636854338e812ab7a40e7746b538badb72a8f0	commit \| diff
parent	dc03a60dfcfff1c1f3c02dfd15b0dec23dfc7269	commit \| diff

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

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

Documentation/filesystems/vfs.txt	diff1 \|	diff2 \|	blob \| history
fs/9p/vfs_file.c	diff1 \|	diff2 \|	blob \| history
fs/gfs2/inode.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
include/linux/fs.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules