Skip to content
Commit 68c404b1 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

Merge branch 'bugfixes' into nfs-for-2.6.38 

Conflicts:
	fs/nfs/nfs2xdr.c
	fs/nfs/nfs3xdr.c
	fs/nfs/nfs4xdr.c
parents d035c36c 6650239a
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