summaryrefslogtreecommitdiff
path: root/fs/nfs/sysctl.c
diff options
context:
space:
mode:
authorAlex Elder <aelder@sgi.com>2011-10-18 20:00:14 (GMT)
committerAlex Elder <aelder@sgi.com>2011-10-18 20:00:14 (GMT)
commit2900b33999e2fc8a8edf0dddaafffec4da25ee10 (patch)
treeb6013dafbf461ee6a0ec4f0f554c02e26877b41a /fs/nfs/sysctl.c
parent9508534c5f170ada5a745cde0df49732718440e9 (diff)
downloadlinux-fsl-qoriq-2900b33999e2fc8a8edf0dddaafffec4da25ee10.tar.xz
xfs: put in missed fix for merge problem
I intended to do this as part of fixing part of the conflict with the merge with Linus' tree, but evidently it didn't get included in the commit. Signed-off-by: Alex Elder <aelder@sgi.com> Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs/nfs/sysctl.c')
0 files changed, 0 insertions, 0 deletions