into samba.org:/scratch/anton/tmp3

into samba.org:/scratch/anton/tmp3

Linker script updates for m68knommu architecture:

 - fix _ramend for DragonEngine2 board
 - add  security init call support

Clean up the dodgy is_in_rom() code for m68knommu targets.

Now that all the m68knommu sub-architectures (68x328, 68360
and ColdFire) have the same memory setup support we can
make this code the same for all targets.

Change the m68knommu specific calls to do_fork() to match
its pid return vlue.

 - Unrevert strncpy->strlcpy change in JEDEC chip driver
 - Fix partition handling in physmap map driver
 - Switch sa1100-flash map driver back to rmk's version.

into infradead.org:/inst/bk/linus-2.5

into samba.org:/scratch/anton/tmp3

sys_wait4 can return a pid and in this case we want to copy the struct
rusage out to userspace.

This updates the orinoco driver, fixing many bugs and adding some minor
features.  It also adds a new module, orinoco_tmd for devices based on
the TMD7168 PCI<->PCMCIA adaptor.

into nuts.ninka.net:/home/davem/src/BK/net-2.5

Bug discovered by Mandred Spraul.

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

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

Also remove mouse_ps2.c which was never referenced from the Makefile.

GCC 3.3 complains that r2 overlaps input operands when a u64 pointer
is passed into __put_user().  Fix this by using ip as a temporary
register instead.

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

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

 - JFFS2 bugfixes and performance improvements
 - Support for 64-bit flash arrangements
 - Optimise for linear mappings of flash, without out-of-line access functions
 - New map drivers
 - Updated NAND flash support, new board drivers
 - Support for DiskOnChip Millennium Plus and INFTL translation layer
 - Clean up all translation layers with a single blkdev helper library.
 - Fix races in MTD device registration/deregistration
 - Add support for new flash chips
 - Clean up partition parsing code

More detailed comments in per-file changelogs.

Anybody who still thinks K&R makes sense should just be shot.

into flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5-pcmcia

socket->base is unmapped in yenta_close(), which is called by
cardbus_remove().  The value of socket->base is not changed to
NULL, so it becomes invalid.

Then cardbus_remove() calls class_device_unregister(), which calls
pcmcia_unregister_socket(), which it turn tries to access memory
space of the socket.

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

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

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