Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge commit 'nfs-for-3.3-4' into nfs-for-next 

Conflicts:
	fs/nfs/nfs4proc.c

Back-merge of the upstream kernel in order to fix a conflict with the
slotid type conversion and implementation id patches...
parents 54b50af0 abe9a6d5
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment