summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds2011-07-30 08:45:06 +0200
committerLinus Torvalds2011-07-30 08:45:06 +0200
commit983236b5741e557451f3ed4ec5ebf1f62a5b2c15 (patch)
tree2b9872f659ac73df93fdaeca4d37654a5a84d4fc /kernel
parentMerge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs... (diff)
parentxfs: Fix build breakage in xfs_iops.c when CONFIG_FS_POSIX_ACL is not set (diff)
downloadkernel-qcow2-linux-983236b5741e557451f3ed4ec5ebf1f62a5b2c15.tar.gz
kernel-qcow2-linux-983236b5741e557451f3ed4ec5ebf1f62a5b2c15.tar.xz
kernel-qcow2-linux-983236b5741e557451f3ed4ec5ebf1f62a5b2c15.zip
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs: xfs: Fix build breakage in xfs_iops.c when CONFIG_FS_POSIX_ACL is not set
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions