summaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-16 08:34:22 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-16 08:34:22 -0800
commit4ef5c68f0a40a95d63c210ba7e3751540e1cb1f1 (patch)
tree3e84110be38ec7f2f8a203d92fff07ceb89a2505 /fs/ecryptfs
parent9fe4145530e6072cc838beb95ca68cada8c56909 (diff)
parent947b10ae0aeda89fc066a7470fdba55f72b0b8fc (diff)
downloadop-kernel-dev-4ef5c68f0a40a95d63c210ba7e3751540e1cb1f1.zip
op-kernel-dev-4ef5c68f0a40a95d63c210ba7e3751540e1cb1f1.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: nilfs2: fix regression of garbage collection ioctl
Diffstat (limited to 'fs/ecryptfs')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud