]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 10 Sep 2007 21:36:37 +0000 (14:36 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 10 Sep 2007 21:36:37 +0000 (14:36 -0700)
commit288a7abebd88aad02e322c3ca724d2e8c139bae1
treec6d1370339a47fbc89c1913f6a8683f257ef3ef4
parentbdc5e21b342f79116ed8d0de5fd218161668d038
parent51e8b3b9bfdae88696140622db057d833dbfd67a
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
  [XFS] fix nasty quota hashtable allocation bug
  [XFS] fix sparse shadowed variable warnings
  [XFS] fix ASSERT and ASSERT_ALWAYS
  [XFS] Fix sparse warning in kmem_shake_allow
  [XFS] Fix sparse NULL vs 0 warnings
  [XFS] Set filestreams object timeout to something sane.