Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 19 Oct 2007 18:55:50 +0000 (11:55 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 19 Oct 2007 18:55:50 +0000 (11:55 -0700)
commitf768f9d3757be475a20cb5f9d63bda45934150b1
treeb9e5ab5ba84c8434a702723ab80ac6f0f990ce23
parent804b908adfcffe3831621acb6c8a776585983d2a
parentc6143911a7e0f8abef0319c801eb36718f57dfde
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] cleanup fid types mess
  [XFS] fixups after behavior removal merge into mainline git