As per the FIXME. Work done by Eric Blade

Just reconfigure on resume..

cpqarray uses disk_alloc instead of alloc_disk.  Same typo is in cciss,
rd.c sets ->first_minor to 0 for all units and HD_IRQ definition is
needed if CONFIG_BLK_DEV_HD is defined.

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

This makes sure we clear the user_tid in copy_thread, and that we
don't pass a bogus tid parameter in sys_clone when the CLONE_SETTID
and CLONE_CLEARTID flags are clear.

into samba.org:/home/paulus/kernel/for-linus-ppc

This also puts the file in include/asm-ppc/offsets.h rather
than arch/ppc/kernel/asm-offsets.h.  This changes PPC to do things
similarly to other ports, and makes make -j work reliably.

Allows usage of quotes in menu options.

By Robert Love, this patch sets the maximum number
of CPUs a kernel can support (From 2-32 on IA32)
The reasoning behind this is a space saving of
8KB per CPU.

From 2.4, mostly just things like quietening compiler warnings.