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

  reconciling TCP_CORK and TCP_NODELAY

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

Two ioctl functions in sound/oss/awe_wave.c were directly dereferencing
a user-supplied pointer in a few places.

Jörn missed a few places of FAR conversion in inflate

Remove the stale support for K&R function declarations through the OF()
macro.

This is the last patch to clean up zconf.h, at least for now.

This nice macro must have been one of the good intentions on the road
to hell.  Completely unused. :)

Just a simple s/ZEXPORT//.

This one was just simple s/ZEXTERN/extern/g.

Remove unused __32BIT__ and STDC macros

This removes FAR, the typedefs using FAR (Bytef and friends) and the
function prototypes for zalloc and zfree that should have gone earlier
already.

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

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

What happens when you get a patch that does something an applied patch 
already does, but a little better, and merge it sloppily: You end up calling
the wrong function because you've defined equivalent methods in two places.

Bad Pat, Bad. 

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

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

into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-core

This fixes a race with looking at files in /sys/class/tty/ and removing a
tty device.

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

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

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

From Mike Anderson: 

I have been using it on an outstanding patch for scsi_set_host_offline. It
appears to work fine in my testing.

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

Update the Rocketport driver

There is a typo in the current 2.5.70 bk version of class_device_release that
was not there in my original patch.  By confusing the class and the class_device,
the release function oops.  cd->release is always the function itself (class_device_release),
cls->release is the one setup for the class (net_class in my case).

i2c-core.c contains 2 loops that iterate over the list of the clients attached
to an adapter and detaches them. Detaching the clients will actually remove
them from the list the loop is iterating over. Therefore the
list_for_each_safe() method has to be used.

This patch fixes the various return values in the w83781d_detect()
error paths.  It also cleans up some formatting here and there.
It should be applied on top of the previous one.

It works for me; same caveat as above w.r.t. ISA.

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

Now the only users of this directly should be the pci core and arch specific
pci core code.

This will let not have to export the pci_devices variable.