]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'nfsd/nfsd-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Oct 2011 00:51:01 +0000 (11:51 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Oct 2011 00:51:01 +0000 (11:51 +1100)
1  2 
fs/compat.c
fs/nfs/nfs4_fs.h
include/linux/fs.h

diff --cc fs/compat.c
Simple merge
Simple merge
Simple merge