[parisc-linux] Merge status with 2.6

[Matthew Wilcox]

On Sat, Feb 07, 2004 at 05:21:08PM +0000, Matthew Wilcox wrote:
> drivers/ide/pci/ns87415.c: I pinged Bart about this patch last week.

This patch just went into Linus' tree.

> drivers/net/tg3.c: Doesn't actually affect PA-RISC; I'll try to get it
> 	merged with jgarzik/davem this week.

Merged with davem.

> drivers/net/tulip: Some of this I'll try to get merged with jgarzik,
> 	other bits he wants rewritten before he'll accept.

The majority of our diff is now merged into jgarzik's tree.

Still some other pieces to do.

-- 
"Next the statesmen will invent cheap lies, putting the blame upon 
the nation that is attacked, and every man will be glad of those
conscience-soothing falsities, and will diligently study them, and refuse
to examine any refutations of them; and thus he will by and by convince 
himself that the war is just, and will thank God for the better sleep 
he enjoys after this process of grotesque self-deception." -- Mark Twain