to avoid collision with the struct bus_type in device.h

* Documentation/networking/e1000.txt: Updated with new device IDs,
updated parameters, updated known issues section.
* drivers/net/Config.help: Updated with new device IDs.
* Added license for Makefile
* Bug fix: ethtool GEEPROM was using word-addressing rather than
byte-addressing.
* Bug fix: Maximum Memory Read Byte Count in PCI-X config space set to
minimum of what device advertises, and what the BIOS assigns, rather
than the maximum, which is the device's default mode, and is incorrect
and will cause problems for large (jumbo frame) read operations.

* Added four new device IDs: 82545EM_COPPER, 82545EM_FIBER,
82546EB_COPPER, 82546EB_FIBER.
* Added a couple magic number definitions for DMA addressable bits.
* Added Power Management Suspend/Resume support.
* Added reboot notifier registration to setup WOL when shutting down.

* Bug fix: detect-for-hang mechanism was getting fooled by
false-positives: fixed.
* Removed unnecessary tx_lock from driver, decreasing CPU utilization
under heavy UDP load.

* Adds support for ETHTOOL_GREGS to dump register set to ethtool. 
* Adds support for ETHTOOL_LEDBLINK to blink LED's on adapter 
  from ethtool. 
* Bug fix: error message added for corrupted EEPROM detection. 
* Bug fix: when setting up link on copper interface, explicitly 
  turn off force speed and duplex before auto-negotiation. 

* Added Documentation/networking/e100.txt.
* Added drivers/net/Config.help text for CONFIG_E100.
* Added ethtool ETHTOOL_PHYS_ID support
* Made ethtool WoL advertisement more selective on h/w controller
version.

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

 - Comment out config_chipset_for_pio from hpt366 driver. It seems to hang on it
   and many people consistently reported that this may be necessary.
   Well apparently this host chip is forced to be in DMA read mode anyway
   and we where undoing this there.

 - Apply small cosmetics to pdc202xx.c driver by Thierry Vignaud.
   His change log entries follow:

      - factorize constants with PDC_CLOCK and UDMA_SPEED_FLAG macros and
	the init_high_16() static inline functions, thus removing floating
	constants in code

      - remove unused variables and pci space read

      - kill useless code in pdc202xx_udma_irq_status() resulting in
	removing unused variable: the code does lots of tests to check what
	value to return but just always return the same exact value in all
	code paths!
	this also saves a few cpu & pci bus cyles by removing a useless read
	in pci space

      - simplify #if/#else resulting in code duplication

      - make init_pdc202xx clearer

      - remove duplicated initializations in config_drive_xfer_rate() and
	simplify code paths

 - Kill unused init_speed member from ata_device struct. Spotted by
   M.H.VanLeeuwen.

 - use list_for_each in head_of_free_region
 - cleanups from 2.4
 - fix for usb
 - kill broken queueing

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

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

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

Remove the old backward-compatible quota interface.

The patch also contains a renaming of functions vfs_{get|set}_info() to
vfs_{get|set}_dqinfo() and minor compilation fix needed for 2.5.18
(include <linux/namei.h>).

This changes the sysctl interface to use reasonable names in
/proc/sys/fs/quota/

I ported the quota changes to 2.5.18.  The first one is just a minor
change to Makefile and Config.in to not build quota.c when not needed.

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

- Simplify the ide-pci code further.

 - Merge ide-probe.c and ide-features.c in to one single file.  They are
   mutually doing basically the same and in esp. in case of the device ID
   retrieval there *is* quite a lot of code duplication between them.
   ide-geometry.c fits there as well.

 - Remove ide_xfer_verbose - it wasn't really used.

 - Don't allow check_partition to be more clever then the writer of a driver.
   It was interfering with drivers which check partitions as they go and
   finally if we want to spew something about it - we can do it ourself.

 - Eliminate ide_geninit(). We scan for partitions now inside the recently
   introduced attach method. register_disk() is broken by the way and 90% of
   places where it's used it is doing literally nothing. Either some one didn't
   finish some code or the code is basically just junk from the past.

   Anyway we grok the partitions now one by one as we detect the channels.

 - ide_driveid_update is gone. We don't report the drive id through /proc/ide
   and we don't have to update it any longer on the fly. Still someone out there
   complaining that it went away!?

 - Use the global driver spin-lock to protect data structure access in the
   ide_register_subdriver() function instead of blatantly disabling all
   interrupts.

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

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

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

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

into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-sync

This patch fixes the bug which happens when utf8 option was used,
by using iocharset for upper/lower conversion.

It's a bit strange that utf8 use iocharset, but this is still needed.

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

This implements what we discussed, basically just maintaing a plug list
from the block layer as a direct parallel to the tq_disk task queue we
had before.  blk_run_queues() now splices the blk_plug_list to avoid
holding the blk_plug_lock across all the request_fn calls.

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

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

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

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

Added the driver to the 2.5 tree.  The original code for 2.4 was
written by Pei Liu <pbl@cypress.com> but cleaned up a bit and 
ported to 2.5 by me.  Any problems in the driver is probably due to
my messing with it.

This driver is for the SL811HS USB host controller chip from
Cypress and is typically contained on a ARM based embedded
system.

Don't include Rules.make in the top-level Makefile, we don't
actually build anything from there, so we don't need the rules.

If asked to build some file in a subdirectory, descend into the
subdir and build it from there - only there we can know what
extra flags etc we have to add.

This also works for building preprocessed [.i] and assembler
output [.s].