Current feisty/upstream delta

[Ben Collins]

On Wed, 2007-04-18 at 17:33 -0400, Kyle McMartin wrote:
> On Tue, Apr 17, 2007 at 12:32:16PM -0400, Ben Collins wrote:
> > - tulip updates
> 
> Via parisc-linux, will be upstream for .22 I believe.

We have some stuff for dmfe on sparc too. Need to see about getting that
upstream sanely.

> > - Disable NMI by default (kyle's patch, might not be suited for 
> >   upstream).
> > 
> 
> Er, I poached this from Linus. Will have to double check.

I didn't see it in current linux-2.6.git.

-- 
Ubuntu:    http://www.ubuntu.com/
Linux1394: http://www.linux1394.org/