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: cf562b1 9bd0bc9)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 7 May 2014 02:07:14 +0000 (12:07 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 7 May 2014 02:07:14 +0000 (12:07 +1000)
commit	b0fa258d4377435a4fe49f63ee126a6b1449bc00
tree	268ec9e60b0746da8af48c0308be381df99458bf	tree \| snapshot
parent	cf562b16dccaa7900fd0748d9a809ac3f513a990	commit \| diff
parent	9bd0bc947d9549d13ecfc03454638f7c5c66154a	commit \| diff

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

Conflicts:
fs/f2fs/file.c

drivers/staging/lustre/lustre/llite/file.c	diff1 \|	diff2 \|	blob \| history
fs/9p/vfs_file.c	diff1 \|	diff2 \|	blob \| history
fs/ecryptfs/file.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/ext4.h	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/nfs/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