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

Merge branch 'devel' into next 

Conflicts:

	fs/nfs/file.c

Fix up the conflict with Jon Corbet's bkl-removal tree
parents 3a628b0f d67d1c7b
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