XFS Master Branch Rebase

[Christoph Hellwig]

On Wed, Jul 28, 2010 at 09:27:19AM +1000, Dave Chinner wrote:
> Alex, this is a bit annoying. Rebases are a real pain for anyone
> downstream that is using git in non-trivial ways.

FYI: I asked Alex to do it, so I'll happily take all the blaim here.

The real problem is that we had quite a merge mess before, which Linus
absolutely doesn't like.  And if I traced it back correctly most of
it actually came from the xfsdev tree.