From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 10 Sep 2007 21:36:37 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
X-Git-Tag: v3.12-rc1~26980
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3c038f97e4b14c322b49f13578e0714e1a2ece53;p=kernel%2Fkernel-generic.git

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.
---

3c038f97e4b14c322b49f13578e0714e1a2ece53