From 2.4, and munged.

From 2.4

Fix incorrect CONFIG_ name

From 2.4 a few months back. With a few edits by
myself to remove the wacky bits of the diff that
backed out fixes. (*Sigh*, Intel).

Been carrying this for ages..

From Jens Axboe:

   This is for changers, we may need more than the default
   5 second timeout for loading a disc since it may require
   moving stuff around :)

From Jens Axboe:

   Only fall back to plain READ, if the device says it doesn't
   support the READ_CD opcode. This is the true error for which
   we want to do the fall back, not for any generic error.

Missing macro header.

This updates the saa7134 driver.  It adds support for a few more cards
and includes adaptions to the video-buf.c changes sent earlier.

This has some i2c adaptions and cleanups for the tv card tuner module.

This updates a bunch of i2c modules in drivers/media/video.  Most of it
are adaptions to the recent i2c changes in the kernel.  While being at
it I also did some other cleanups like deleting unused+dead code, using
name-based initialization for some not-yet converted structs, ...

The also has a few small fixes here and there, but no major functional
changes.

This adds a driver module for the bt832 chip.  It is needed by the bttv
driver to support the Pixelview Digital Camera.  The bt832 is connected
using the GPIO pins of the bt878 chip.

This updates the bttv driver.  Changes:

 * adaptions to the video-buf changes send in a previous mail.
 * adaptions to recent i2c changes in the kernel.
 * first code bits the pixelview digital camera support (not
   working yet).
 * lots of small fixes/changes for specific TV cards.

This adds the v4l1-compat module.  This is a module which can translate
most (old) v4l1 ioctls into the new v4l2 API.  This makes it easier for
v4l2 drivers to present both old v4l and new v4l2 APIs to video4linux
applications.  The saa7134 driver uses this for example.

This updates the video-buf helper module.  It changes the field handling
a bit and adds code do deal better with alternating field capture (=
capture even and odd fields to separate video buffers).

This adds the tda9887 i2c module to the linux kernel.  This one is
needed for some TV cards.  It also adds the missing #define to
audiochip.h which currently breaks the bttv build.

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

This adds support for 405GPR, 405LP, STBx25, NP4GS3.

Some of this comes from recent work in the 2_4_devel tree, including the
conversion to using an array (core_ocp[]) to describe on-chip peripherals
in a standard format.  The other major change is to give the board file
control early on in the boot and let it call back to generic 4xx routines
rather than vice-versa.

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

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

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

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

Here is the s390x part of the compat_timespec changes.

Andi Kleen asked for these two, so here they are.  This is the generic
part of creating compat functions for timespec get/put.

Converts the RPC client auth code to use 'list_head' rather than a
custom pointer scheme.

Fixes a (relatively harmless) race which could cause several cred
entries to be created for the same user.

Patch by Chuck Lever to add a new field called wb_pgbase to the
nfs_page struct. This separates the concept of file page offset from
buffer page offset, allowing NFS to specify read and write requests
into buffers at offsets that are independent of the file page
offset. It is a prequisite for direct I/O in NFS.

 This fixes a bug that was found using the Stanford checker.

bio_alloc() shouldn't fail if GFP_NOIO is used, and the bvec count is
sensible.  So remove redundant error checking.

Export dm_table_get_mode()

Just return an error from the error targets map function, rather than
erroring the buffer_head.

printk tgt->error if dm_table_add_target() fails.

Remove explicit return at the end of a couple of void functions.

Call dm_put_target_type() *after* calling the destructor.

Use a rw_semaphore in dm_target.c rather than a rwlock_t, just to keep
in line with dm.c

ti->use was only getting incremented the first time a target type was
retrieved (bug introduced by recent hch patch).