* [MERGE] net into net-next
@ 2013-02-05 19:20 David Miller
0 siblings, 0 replies; only message in thread
From: David Miller @ 2013-02-05 19:20 UTC (permalink / raw)
To: netdev; +Cc: linville
I just merged net into net-next.
Most of the conflicts were trivial, except perhaps the iwlwifi one
which is dealing with a revert that happened on the 'net' side.
John please double-check my work. It's ironic that this happened
because you did a wireless mainline merge the last time you asked me
to pull into net-next exactly to avoid conflicts in this piece of code
:-)
Thanks.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-02-05 19:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-05 19:20 [MERGE] net into net-next 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).