[parisc-linux] Merge status with 2.6

[Matthew Wilcox]

On Sat, Feb 07, 2004 at 05:21:08PM +0000, Matthew Wilcox wrote:
> kernel/sysctl.c: Have we really removed these sysctls or is this a merge
> 	artifact?

Merge botch, needs to be removed from upstream.  Art Haas coincidentally
pointed this one out to me today.  It's going in via akpm.

-- 
"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