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

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

into redhat.com:/garz/repo/net-drivers-2.5

dev_ioctl already checks capable(CAP_NET_ADMIN) for SOICETHTOOL, so
privileged reference are not necessary.

Add 10GbE support for ethtool.

This one should be safe as we're protected by the xmit_lock in all instances

Attached is a driver for Atmel at76c50x WiFi cards. This code started
out as a GPL release from Atmel of pretty horrible quality and I've
extensively re-worked it with the aim of making it acceptable in the
kernel. Please could you take a look and either pass it into the patch
stream or let me know what's wrong with it?

The code has been tested on at least three different brand cards by
different people. Jean Tourrilhes took a look at an earlier version an
was positive. He's put incorporating this into 2.6 as a priority 1.
The patch works fine on 2.5.70.

The firmware issue has been addressed now. The only firmware in the
driver is a small stub which reads the MAC address from NVRAM on the
card. The source for that is included so there are no GPL issues. The
main firmware is loaded from userspace using Manuel Estrada Sainz's
sysfs firmware class. I know that the  patch for that has been
accepted but it hasn't turned up anywhere I can see yet. The 
driver compiles fine even without the firmware class. I've made a
package of the firmware images which is available from my website.

The remaining issues with the driver are migrating PCMCIA to the new
driver model and PCI support. I'm happy to produce followup patches as
the PCMCIA system gets evolved to the new driver model: the timing on
that is controlled by others. This set of chips includes a PCI version
and the driver should support that, but AFAIK there is no PCI hardware
available anywhere. If Atmel can provide me with some it will be
simple to add PCI support.

The driver uses the CRC32 library module and the firmware loader. I've
not put in dependencies on those, but when the lastest set of patches
go into Kconfig I'll set it up so that selecting the Atmel driver
selects CRC32 and FW_LOADER too.

Inspecting the sb1000 driver showed some interesting bugs:
	- net device pointer is used before the device is allocated; gcc
	  does catch this.
	- unregister is called even though device not registered successfully
	- net device is not freed on remove.

Compiles but don't have hardware to test.  Don't know how it ever worked though.

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