Merge remote-tracking branch 'nfsd/nfsd-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 00:07:28 +0000 (11:07 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 00:07:28 +0000 (11:07 +1100)
1  2 
fs/namei.c

diff --cc fs/namei.c
Simple merge