summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfssvc.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2013-09-06 20:23:44 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-09-06 20:23:44 -0700
commit07176b988ebb20f46a317a60ee1d983fe1630203 (patch)
treee54affb1f823742078c68d9506e6035016bc2ea4 /fs/nfsd/nfssvc.c
parentfa46c7984092f3dbdbb3bcd7338d81a1168d9d2b (diff)
parent52764fed5049655926bcecaefd52f0a415ceb105 (diff)
downloadlinux-07176b988ebb20f46a317a60ee1d983fe1630203.tar.bz2
Merge branch 'next' into for-linus
Merge first round of changes for 3.12 merge window.
Diffstat (limited to 'fs/nfsd/nfssvc.c')
0 files changed, 0 insertions, 0 deletions