Re: [GIT]: Networking for 2.6.30

Linus Torvalds
2009-03-26T22:59:21Z

On Thu, 26 Mar 2009, David Miller wrote:
>
> Just FYI, I've just pushed a merge of the changes you pulled in today
> in order to resolve the one merge conflict that arose.

Well, I merged infiniband, and that caused more conflicts. I fixed them
up, but people need to double-check my fixes.

Linus