On Tue, May 05, 2009 at 10:14:38PM -0700, Greg KH wrote:
> On Tue, May 05, 2009 at 05:32:04PM -0700, David Daney wrote:
> > This patch set introduces the octeon-ethernet driver into the
> > drivers/staging tree. The Octeon is a mips64r2 base multi-core SOC
> > family.
> > The first five patches are small tweaks to the existing octeon support
> > that are required by the ethernet driver. I would expect them to be
> > merged via Ralf's linux-mips.org tree.
> > The last two are the driver, and would probably be merged via the
> > drivers/staging tree. However since they depend on the first five,
> > they probably shouldn't be merged until those five are merged.
> Ralf, if you want to take the 2 staging driver patches, that's fine with
> me to make it easier. Or if you want me to merge it, on the next merge
> window, with the mips patches through my tree, I can do that as well.
> Which ever is easier for you.
As per recent discussions I've queued the driver. Will go to Linus as part
of the next pull.