bcba8270fe30b9aa1de0
parent 1c70132ffbd3c93558c1c0b34ae228543391f355
parent 9f9c19ec1a59422c7687b11847ed3408128aa0d6
author Linus Torvalds <torvalds@linux-foundation.org> 1323303234 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1323303234 -0800

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()
*