From: Linus Torvalds Date: Sat, 30 Jul 2011 06:45:06 +0000 (-0700) Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs X-Git-Tag: v3.1-rc1~117 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=983236b5741e557451f3ed4ec5ebf1f62a5b2c15 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 --- 983236b5741e557451f3ed4ec5ebf1f62a5b2c15