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: 960d576 d987f08)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 9 Apr 2015 02:27:55 +0000 (12:27 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 9 Apr 2015 02:27:55 +0000 (12:27 +1000)
commit	a927ec768554cd1d195e323efe63783a912cc4b1
tree	e1fa12cb563eb5e45f97f268d4849e64dcb1d6a6	tree \| snapshot
parent	960d576b5f77574bd1d4edc6eeb0e13c0aadad24	commit \| diff
parent	d987f083c43b19ac50bb5b6c2263dbcba1107117	commit \| diff

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

Conflicts:
fs/ext4/inode.c
fs/udf/file.c
net/9p/protocol.c

30 files changed:

arch/arc/kernel/process.c	diff1 \|	diff2 \|	blob \| history
crypto/algif_skcipher.c	diff1 \|	diff2 \|	blob \| history
fs/9p/vfs_addr.c	diff1 \|	diff2 \|	blob \| history
fs/9p/vfs_file.c	diff1 \|	diff2 \|	blob \| history
fs/affs/file.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/file.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/cifs/cifsfs.c	diff1 \|	diff2 \|	blob \| history
fs/cifs/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/ext4/page-io.c	diff1 \|	diff2 \|	blob \| history
fs/f2fs/data.c	diff1 \|	diff2 \|	blob \| history
fs/f2fs/file.c	diff1 \|	diff2 \|	blob \| history
fs/gfs2/aops.c	diff1 \|	diff2 \|	blob \| history
fs/gfs2/file.c	diff1 \|	diff2 \|	blob \| history
fs/hostfs/hostfs_kern.c	diff1 \|	diff2 \|	blob \| history
fs/open.c	diff1 \|	diff2 \|	blob \| history
fs/ubifs/file.c	diff1 \|	diff2 \|	blob \| history
fs/udf/file.c	diff1 \|	diff2 \|	blob \| history
fs/udf/inode.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_file.c	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
kernel/sysctl.c	diff1 \|	diff2 \|	blob \| history
net/9p/protocol.c	diff1 \|	diff2 \|	blob \| history
net/9p/trans_virtio.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/raw.c	diff1 \|	diff2 \|	blob \| history
security/selinux/hooks.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules