Now that we use idedefault_driver.drives instead of ata_unused, the order
of drives on the driver->drives becomes significant; note that when we added
to ata_unused, we had done that to the end of list.

So we should do the same with the "drives" list.

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

  - added drivers for Digigram VXPocket V2, VXPocket 440 (pcmcia)
  - added driver for Digigram VXP220 V2/Mic (PCI)
  - added driver Harmony chipset (parisc)
  - added OPL4 driver
  - code cleanups - removed 2.2 and 2.4 code
  - nm256 driver - added Dell Latitude LS workaround
  - ac97 driver - fixes in intialization
  - usb audio driver - strlcat() fixes

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

into suse.cz:/home/perex/bk/linux-sound/linux-sound

With this the area that is shared among struct sock and struct tcp_tw_bucket
is exact, i.e. there is no fields that are in struct sock and only reused
for other reasons in tcp_tw_bucket, while keeping both struct free of holes.

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

Avoid touching the next page in the NMI handler stack validity check.

That way, we can start unmapping pages that aren't in use, without
triggering this case.

More zlib K&R to ANSI C function header conversions.

This updates the matroxfb driver to the new framebuffer API.

I'm sorry that it is quite large, but due to completely changed
underlying API there is no reasonable way how to split it into smaller
pieces.

 - Removed support for text mode. No way for it with current API.
 - Removed support for hardware cursor. Generic cursor code has enough
   troubles as is, in software mode.
 - No reasonable fbset support... It is especially annoying on multihead
   system, as 'stty cols XXX rows YYY' does not change pixclock...
 - Removed fastfont support. No way for it with current API.

(Mis)features inherited from generic fbdev API:
 - Cursor on other framebuffers than primary one does not blink.
 - Contents of visible, but not foreground, display is not updated.

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

This patch reinstates the ability of tty devices to use dynamically
allocated major numbers yet specify the minor numbers statically.

The synclink drivers do this.

This patch adds some new vendor/product ids for the USB scanner
driver.

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

The recent writev() fix broke the invariant that ->commit_write _must_ be
called after a successful ->prepare_write().  It leaves ext3 with a
transaction stuck open and the filesystem locks up.

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

- Kill the bogus ret transformation in block/ioctl.c if we return
  -EINVAL, doesn't make any sense.

- Don't allow sg_reserved_size to be set bigger than a request we can
  deal with...

- timeout fixes.

- Cleanup of user access.

- Set SAM_STAT_CHECK_CONDITION, not CHECK_CONDITION which needs to be
  bit shifted 1 up.

- Set sense_len correctly.

- Account sense_len correctly, don't just increment by 1...

- Use the correct pointer in post transform.

- Fix oops in bio_map_user(), it must get the extra reference prior to
  calling bio_unmap_user() itself too.

According to http://www.torque.net/sg/p/sg_v3_ho.html, SG HOWTO,
SG_[GET|SET]_TIMEOUTs are measured in "jiffies," while timeout field
of SG_IO structure - in milliseconds. Inconsistent? Yes. Yet it's no
excuse to disregard the specification. "Jiffies" are USER_HZ, 10ms on
IA-32 platforms and has to be scaled to kernel "jiffies," as suggested
below. As for "(jiffies - start_time) * (1000 / HZ)" vs.
"((jiffies - start_time) * 1000) / HZ." Just think that HZ is 1024 on
some platforms...

Assorted small ide-cd fixes, found and fixed by Andy Polyakov
<appro@fy.chalmers.se>.

- CHECK_CONDITION really wants to be SAM_STAT_CHECK_CONDITION, the damn
  bit shift by one bit again

- Set sense_len correctly

- Do post_transform() on the right buffer.

From: Milton Miller <miltonm@bga.com>

Fix two problems related to list_head's (there are more, wip).
Second bug was uncovered by wli's list_head debugging patch, thanks wli!

- Remove ata_unused list and use &idedefault_driver->drives only,
  fixes list corruption (ata_unused will be later ressurected for hotplug).

- Do not add same device twice to &idedefault_driver->drives, triggered
  by first calling ide_unregister_subdriver() and later ata_attach().

Since Andries killed ide-geometry, remove "hdX=noremap"
parameter as it is no longer needed.

Allow a user to mark a device as for scsi
emulation at boot even with modular scsi/ide-scsi.
(from 2.4 patch by Matan Ziv-Av)

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

Linux 2.5.69-bk18 prints something strange to the kernel log when the USB
scanner is attached.  It turns out drivers/usb/image/scanner.c uses
uninitialized variable "name" in probe_scanner() in the printk() call.
That means that random memory is read and output to the kernel log.

Until my ambitious project gets going, this patch at least fixes the
problem of assigning a device's new address following a device reset.
The only change needed to David's original suggestion was to handle the
pathway involved in registering root hubs.

into shaggy.austin.ibm.com:/shaggy/bk/jfs-2.5

This is needed, as the file was deleted over a year ago...

into suse.cz:/home/perex/bk/linux-sound/linux-sound

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

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