Re: [GIT]: Networking for 2.6.30

David Miller
2009-03-26T23:01:08Z

From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 26 Mar 2009 15:56:24 -0700 (PDT)

> 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.

Will do.