From:  Michael Still <mikal@stillhq.com>

(Included in 2.4)
From:  Christopher Hoover <ch@hpl.hp.com>

  The #ifdef MODULE is just wrong, but both #ifdef/#endif's can be
  deleted as the code is surround by a wider #ifdef
  CONFIG_VIDEO_PROC_FS/#endif.

From:  Michael Still <mikal@stillhq.com>

From:  Michael Still <mikal@stillhq.com>

From:  Marcus Alanen <maalanen@ra.abo.fi>

From:  william stinson <wstinson@wanadoo.fr>

From:  william stinson <wstinson@wanadoo.fr>

          1) remove one call to check_region using request_region instead
          2) release allocated region resource in case of error.

From:  Tommi Virtanen <tv@debian.org>

  	timer_exit() isn't a public function, and doesn't even exist in 2.5.
  	2.4 calls it internally after timers. It seems timer users need not
  	do anything special.

From:  Marcus Alanen <maalanen@ra.abo.fi>

From:  Kingsley Cheung <kingsley@aurema.com>

(Included in 2.4)
From:  Gerd Knorr <kraxel@bytesex.org>

  This makes the gemtek radio device start muted.

From:  Greg Ungerer <gerg@moreton.com.au>

  Fixups to the system call table of the m68knommu arch support.
  Chnages the old style module system calls to sys_ni_syscall.

From:  Andries.Brouwer@cwi.nl

From:  Marcus Alanen <maalanen@ra.abo.fi>

  "shapers_registered" is the amount of netdevices registered,
  "shapers" is the amount of shapers we try to initialize.

From:  Brad Hards <bhards@bigpond.net.au>

From:  william stinson <wstinson@wanadoo.fr>

From:  Michael Still <mikal@stillhq.com>

From:  John Levon <levon@movementarian.org>

  Make it clear that _destroy() won't do the kmem_cache_free()s for you

From:  Brad Hards <bhards@bigpond.net.au>

From:  Brad Hards <bhards@bigpond.net.au>

From:  Andreas Dilger <adilger@clusterfs.com>

  This fixes a minor thinko in the endianness conversion of
  i_generation.  This bug is not present in ext2, but is on both 2.4
  and 2.5 ext3.  The same patch applies cleanly to both kernels.

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

As pointed out by Greg KH, kbuild gives spurious warnings in some cases,
fixed by this patch.

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

Argh, missed one line in the generated assembly, which is kinda important.

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.