[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20090326.160055.187303434.davem@davemloft.net>
Date: Thu, 26 Mar 2009 16:00:55 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: torvalds@...ux-foundation.org
Cc: rdreier@...co.com, akpm@...ux-foundation.org,
netdev@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [GIT]: Networking for 2.6.30
From: Linus Torvalds <torvalds@...ux-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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists