into nuts.ninka.net:/disk1/davem/BK/net-2.5

into home.osdl.org:/home/torvalds/v2.5/linux

... as if "nohide" is in used, it will be the wrong filehandle, and
returning a filehandle is optional anyway.

When raid0 needs to split a request, it uses 'block' (1K) addresses
rather than sector (512b) addresses, which causes problems if the sector
address is odd.  This patch fixes the problem.

Thanks to Andy Polyakov <appro@fy.chalmers.se>

As found by Herbert Xu: the last v4l update broke bttv.  videobuf_iolock
was passed a vb that has just been filled with zeros. 

Fixed like this.

From: "Noah J. Misch" <noah@caltech.edu>

The Silicon Image driver is not building properly when CONFIG_PROC_FS is unset.
This patch corrects that problem.  It appears as though several utility
functions at the top of drivers/ide/pci/siimage.c that the driver always needs
accidentally fell within an #ifdef CONFIG_PROC_FS.  I also removed an excess
include while I noticed it.

into hostme.bitkeeper.com:/repos/c/cifs/linux-2.5cifs

They were added by Torben to workaround ServerWorks driver problems
(fixed by previous patch), but depending on BIOS can be dangerous on
other chipsets and it is always better to fix specific driver.

Removal of these options was acked by Torben.

If PIO mode should be auto-tuned xferspeed argument for svwks_tune_chipset()
is equal to 255 (0xFF).  It is then passed to ide_rate_filter() which matches
desired mode with chipset capabilities.  Since 255 is greater than any of the
values used for transfer modes, ide_rate_filter() will always return the
highest mode supported by both device/chipset (which sometimes should not be
used ie. when host is a simplex one) and the wrong mode will be set.

Thanks to Torben Mathiasen and Tomas Szepe for testing it.

The original change turned out to be too restrictive, it catches devices
that don't need the work around.

This fixes that, thanks to Bart for informing me of the screwup.

into kernel.bkbits.net:/home/davem/net-2.5

into home.osdl.org:/home/torvalds/v2.5/linux

into home.osdl.org:/home/torvalds/v2.5/linux

into home.osdl.org:/home/torvalds/v2.5/linux

Patch from George G. Davis

Basically just adds a couple of missing vars so I can build bootpImages for SA1100.

Patch from George G. Davis

This fixes a couple of params-phys typos