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)
commit3c038f97e4b14c322b49f13578e0714e1a2ece53
treec6d1370339a47fbc89c1913f6a8683f257ef3ef4
parent83dc3d43ce06d3466f48046577331d06a40b8344
parent5995cb7d805496362e5af73235145667096fbc6f
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.