From: Linus Torvalds Date: Fri, 2 Dec 2011 18:38:20 +0000 (-0800) Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ffb8fb5469315755ec2dd462452dcb869b358d55;p=mv-sheeva.git Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs * 'for-linus' of git://oss.sgi.com/xfs/xfs: xfs: fix attr2 vs large data fork assert xfs: force buffer writeback before blocking on the ilock in inode reclaim xfs: validate acl count --- ffb8fb5469315755ec2dd462452dcb869b358d55