]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'nfsd/nfsd-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 01:45:14 +0000 (12:45 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 01:45:14 +0000 (12:45 +1100)
commit067d35817038da4a5d5bb6204626affc0b727f6e
tree2b320fc082a836f9a28b0d09fd335cfeeb751c08
parent01760973fcdd1f110f7b6dc2b4467447533611f0
parentb6d2f1ca3c1162f51098969e9c52fd099720416a
Merge remote-tracking branch 'nfsd/nfsd-next'
fs/compat.c
fs/nfs/nfs4_fs.h
include/linux/fs.h