OSDN Git Service

Merge remote-tracking branch 'nfsd/nfsd-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 25 Sep 2015 00:16:51 +0000 (10:16 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 25 Sep 2015 00:16:51 +0000 (10:16 +1000)
1  2 
fs/namei.c

diff --cc fs/namei.c
Simple merge