]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'vfs/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 00:50:44 +0000 (10:50 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 00:50:44 +0000 (10:50 +1000)
commit42c90765d37f1bacfebae9ba524e507016a04ac3
tree6fa4b61fbfb6203c37b07375cdeb8361917c4333
parent563535be1fde141bd65ed426b834af5c67b3ae92
parent319074ee92c16eb4739653eba96ad1114943ed25
Merge remote-tracking branch 'vfs/for-next'

Conflicts:
fs/stat.c
kernel/events/core.c
fs/btrfs/ioctl.c
fs/ext4/ioctl.c
fs/fuse/dev.c
fs/locks.c
fs/nfsd/nfs4state.c
fs/ocfs2/cluster/heartbeat.c
fs/stat.c
kernel/events/core.c
mm/mmap.c
net/9p/trans_fd.c
net/socket.c