into nuts.davemloft.net:/disk1/BK/net-2.6

into nuts.davemloft.net:/disk1/BK/net-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Also clean it all up - use get_cpu()/put_cpu() instead of
playing games by hand with preemption.

Here is a simple patch which drops some out-of-date code in the w83781d
and w83627hf i2c chip drivers. These bits are left over from the times
when chip drivers were setting default limits at init.


Signed-off-by: Jean Delvare <khali at linux-fr dot org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

into kroah.com:/home/greg/linux/BK/driver-2.6

Al missed this one in his sparse fixes
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Mika Kukkonen <mika@osdl.org>
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Mika Kukkonen <mika@osdl.org>
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Mika Kukkonen <mika@osdl.org>
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The poor cousins also need this, LLC will be the first to use it.
Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>

Renaming it to sk_stream_moderate_sndbuf, further patches will move
all the tcp memory pressure handling support into net/core/stream.c
to make them usable by the poor cousins, starting with LLC.
Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>

Will be used by the poor cousins
Signed-of-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>

Split ata_eng_timeout into the main part (ata_qc_timeout)
and the part called by the SCSI layer (ata_eng_timeout).

Zero behavior changes.

Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>

On Sun, Jun 20, 2004 at 05:46:32PM -0700, Andrew Morton wrote:
>...
> All 226 patches:
>...
> bk-libata.patch
>...

drivers/scsi/hosts.h is obsolete, use scsi/scsi_host.h.

Please apply
Adrian

by "other". The normal permissions for the kernel tree
should be -rw-r--r--.

sock_fprog instances that had kernel pointer in ->filter (both of them -
in ppp_generic and isdn_ppp) replaced with explicit pairs len + kernel
pointer.  Copying of userland sock_fprog (with its __user ->filter)
cleaned up and sanitized.

Trivial annotation done in the rest of ->ioctl() in ppp_generic and
isdn_ppp.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into intel.com:/home/lenb/bk/linux-acpi-test-2.6.7

Reflect that only the dstirq depends on the dstapic.

into intel.com:/home/lenb/bk/linux-acpi-test-2.6.7

caused by errant fix for OSDL 2835