netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* git trees merged...
@ 2010-09-10  6:06 David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-09-10  6:06 UTC (permalink / raw)
  To: netdev


I just completed and pushed out a Linus --> net-2.6 --> net-next-2.6
merge.

Just FYI...

^ permalink raw reply	[flat|nested] 2+ messages in thread

* GIT trees merged...
@ 2010-12-27  7:19 David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-12-27  7:19 UTC (permalink / raw)
  To: netdev


I've done a set of Linus --> net-2.6 --> net-next-2.6 GIT tree
merged, mainly to resolve the conflict that existed for
net/ipv4/fib_frontend.c

Just FYI...

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-12-27  7:19 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-27  7:19 GIT trees merged David Miller
  -- strict thread matches above, loose matches on Subject: below --
2010-09-10  6:06 git " David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).