Re: [git pull] x86 fixes

Linus Torvalds
2008-07-15T16:03:36Z

On Tue, 15 Jul 2008, Ingo Molnar wrote:
>
> hm, you just pushed another fix for that out via:
> [...]
> that would collide. Here's a (separate) merged up tree that will pull
> cleanly:

Heh, I just merged it myself - it happens all the time, I did't even think
about it.

If it had been any more complex I would have emailed you (and hopefully
noticed this follow-up email before doing that), but it was rather obvious
enough, and I just picked your side.

Linus