tree b9e5ab5ba84c8434a702723ab80ac6f0f990ce23
parent 804b908adfcffe3831621acb6c8a776585983d2a
parent c6143911a7e0f8abef0319c801eb36718f57dfde
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1192820150 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1192820150 -0700

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