Skip to content
Commit a584143b authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

Merge branch 'locks-3.20' of git://git.samba.org/jlayton/linux into for-3.20 

Christoph's block pnfs patches have some minor dependencies on these
lock patches.
parents 4c94e13e 8116bf4c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment