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)
commit6110e02b97377a2903853faf3ecaff0e742fbe93
tree44fca61193f773e84c6c38ba8d9712d151677d8b
parent36a740974129d7301054fa810adf22025896be78
parent1bc5858d0d40e07697b5eda47ed8628b8a934235
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 valid but harmless sparse warning
  [XFS] fix filestreams on 32-bit boxes