into tp1.ruhr-uni-bochum.de:/home/kai/src/kernel/v2.5/linux-2.5.make

From davem: replace `unsigned' with size_t.

into home.transmeta.com:/home/torvalds/v2.5/linux

into mandrakesoft.com:/home/jgarzik/repo/net-drivers-2.5

into mandrakesoft.com:/home/jgarzik/repo/net-drivers-2.5

(releases memory block after read out)

[note - more work needs to be done here, but this is better than
nothing -jgarzik]

floppies and CD's in /proc/partitions.

into tp1.ruhr-uni-bochum.de:/home/kai/src/kernel/v2.5/linux-2.5.make

Some idiot (OK, it was me) broke free_area_init_node for
non discontigmem systems that call it directly (eg sparc64),
during a recent cleanup, thus invoking the wrath of DaveM.

I know Dave sent you a patch yesterday, but I think the BUG
statement in it will break anyone who just uses free_area_init
(eg any PC). So here's a portion of Dave's patch that should
fix things for everyone I think. Unfortunately my non-NUMA
test box is borked right now, but it just removes the BUG
statement from what he tested, and it's so simple that even
I couldn't screw this up (famous last words).

This code really needs some more cleanup work, but this will
fix it for now so everyone can do their work ...

into home.transmeta.com:/home/torvalds/v2.5/linux

swim_iop switched to use of gendisk

acorn floppy switched to use of gendisk

xpram switched to use of gendisk

nbd switched to use of gendisk

rd switched to use of gendisk

stram switched to use of gendisk

sonycd switched to use of gendisk; missing initcall restored

sjcd switched to use of gendisk; missing initcall restored

optcd switched to use of gendisk; missing initcall restored

gscd switched to use of gendisk; missing initcall restored

aztcd switched to use of gendisk; missing initcall restored (aztcd_init()
and friends used to be called directly from blk_dev_init(); apparently
the first step of bio merge had killed these calls but left module_init() in
these drivers under #ifdef MODULE).