Skip to content
Commit 6a396f67 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

Merge branch 'nfsv4_xdr_cleanups-for-2.6.32' into nfs-for-2.6.32 

Conflicts:
	fs/nfs/nfs4xdr.c
parents f884dcae cccddf4f
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment