Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 22 Sep 2007 19:56:13 +0000 (12:56 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 22 Sep 2007 19:56:13 +0000 (12:56 -0700)
* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
  [XFS] fix valid but harmless sparse warning
  [XFS] fix filestreams on 32-bit boxes


Trivial merge