| commit | a694ad94bce2a0287136043e25cff856ce3a1007 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 07 16:13:54 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 07 16:13:54 2011 -0800 |
| tree | 56cc4ee94f0358a082b1bcba8270fe30b9aa1de0 | |
| parent | 1c70132ffbd3c93558c1c0b34ae228543391f355 [diff] | |
| parent | 9f9c19ec1a59422c7687b11847ed3408128aa0d6 [diff] |
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()