From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 8 Dec 2011 00:13:54 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: v3.2-rc5~32
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=a694ad94bce2a0287136043e25cff856ce3a1007;p=linux.git

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

a694ad94bce2a0287136043e25cff856ce3a1007