]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'nfsd/nfsd-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Sep 2011 00:16:54 +0000 (10:16 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Sep 2011 00:16:54 +0000 (10:16 +1000)
1  2 
fs/nfs/nfs4_fs.h
include/linux/fs.h

Simple merge
Simple merge