Skip to content
Commit 1f84603c authored by Trond Myklebust's avatar Trond Myklebust
Browse files

Merge branch 'devel-for-2.6.31' into for-2.6.31 

Conflicts:
	fs/nfs/client.c
	fs/nfs/super.c
parents 301933a0 4bf259e3
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