into samba.org:/scratch/anton/for-alan

into samba.org:/scratch/anton/linux-2.5_ppc64_work

into samba.org:/scratch/anton/linux-2.5_ppc64_work

into samba.org:/scratch/anton/linux-2.5_ppc64_work

into samba.org:/scratch/anton/for-alan

into samba.org:/scratch/anton/linux-2.5_ppc64_work

I compiled , booted, and checked base attributes for edd/* against the
patch.  I guess I need to get newer hardware one of these days.

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

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

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

into kroah.com:/home/greg/linux/BK/gregkh-2.5

into kroah.com:/home/greg/linux/BK/gregkh-2.5

This fixes edd.c.  The SCSI changes replaced host_driverfs_dev with a
pointer to a struct device.  But, the Scsi_Host that the
edd_find_matching_scsi_device() was trying to get was never used anyway.
So, I removed it.

This also fixes a problem that I introduced a while ago, and that I
promised Matt I would fix: all attributes were getting added by default,
though they shouldn't be.  This regards only the truly default
attributes as default, and uses the test mechanism of the other
attributes to determine whether to add them or not.

In <= 2.4 some of the mess in blk.h needed it defined, but that's
long gone now.

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

Move unregister_devfs_entries under the #ifdef MODULE section to
avoid the warning about unused functions.

Remove cr0; the variable is unused.

Remove the reboot.h declaration of swsusp functions that clash
with the no-op inline.