Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Dec 2011 18:38:20 +0000 (10:38 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Dec 2011 18:38:20 +0000 (10:38 -0800)
commitffb8fb5469315755ec2dd462452dcb869b358d55
treeee0f96ac0431819efc9c1233c07076e0d90d4a73
parent7ed89aed2b897059c3d733cbd4994035b4ce1fba
parent4c393a6059f8442a70512a48ce4639b882b6f6ad
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