From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: linux-next: manual merge of the trivial tree with the net tree Date: Thu, 04 Feb 2010 09:33:29 -0800 (PST) Message-ID: <20100204.093329.164097227.davem@davemloft.net> References: <4B6AC28D.6090204@st.com> <4B6AD11D.6050402@st.com> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: jkosina@suse.cz, sfr@canb.auug.org.au, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, lsorense@csclub.uwaterloo.ca, netdev@vger.kernel.org, daniel@caiaq.de To: peppe.cavallaro@st.com Return-path: In-Reply-To: <4B6AD11D.6050402@st.com> Sender: linux-next-owner@vger.kernel.org List-Id: netdev.vger.kernel.org From: Giuseppe CAVALLARO Date: Thu, 04 Feb 2010 14:52:29 +0100 > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Giuseppe CAVALLARO wrote: >> Hi Jiri, >> >> The stmmac driver included in net-next has been restructured: for this >> reason both gmac.c and mac100.c files do not exist any more. >> >> Let me know if I can help on this; I mean I'm happy to apply this latest >> changes to the stmmac in net-next and send a new patch. > > patch attached > I hope it could be useful. Applied, thank you.