summaryrefslogtreecommitdiff
path: root/fs/ocfs2/acl.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-05 17:35:44 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-05 17:35:44 (GMT)
commit8901e7ffc2fa78ede7ce9826dbad68a3a25dc2dc (patch)
treee1a7735557b8d875e5827f889e658d3b5a717848 /fs/ocfs2/acl.c
parent90975ef71246c5c688ead04e8ff6f36dc92d28b3 (diff)
parent1359096eacb1971be67eead8bf9b582864d92a30 (diff)
downloadlinux-fsl-qoriq-8901e7ffc2fa78ede7ce9826dbad68a3a25dc2dc.tar.xz
Merge branch 'bzip2-lzma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip
* 'bzip2-lzma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip: bzip2/lzma: quiet Kconfig warning for INITRAMFS_COMPRESSION_NONE
Diffstat (limited to 'fs/ocfs2/acl.c')
0 files changed, 0 insertions, 0 deletions