]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit71a642a7b06bc969a84e0548c64f02c037ef3a75
tree56cc4ee94f0358a082b1bcba8270fe30b9aa1de0
parentb35ddf09d7904541f19a544a5212ebaee0b2fbe3
parentc583359c3e4a8309f10951c237efc48a35d6d04b
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()