Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Dec 2011 00:13:54 +0000 (16:13 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Dec 2011 00:13:54 +0000 (16:13 -0800)
commita694ad94bce2a0287136043e25cff856ce3a1007
tree56cc4ee94f0358a082b1bcba8270fe30b9aa1de0
parent1c70132ffbd3c93558c1c0b34ae228543391f355
parent9f9c19ec1a59422c7687b11847ed3408128aa0d6
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: fix the logspace waiting algorithm
  xfs: fix nfs export of 64-bit inodes numbers on 32-bit kernels
  xfs: fix allocation length overflow in xfs_bmapi_write()