]> 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, 16 Sep 2011 02:18:42 +0000 (12:18 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 Sep 2011 02:18:42 +0000 (12:18 +1000)
commit5146875d800c7c1349dab7cf5879b74d64b5f9f4
tree858a4a4cee51e77f3aa6762914fec6aaabaaa995
parentc9f6c2dc8e09ba9ba551cfc36e87b0c23effc5c7
parent9072d5c66b17292e3cd055bc8057b2ce6af2fe34
Merge remote-tracking branch 'nfsd/nfsd-next'
fs/compat.c
fs/nfs/nfs4_fs.h
include/linux/fs.h