From Herbert Xu
Signed-off-by: Dave Jones <davej@redhat.com>

Spotted by Joe Perches.

I'm surprised gcc didn't at least warn about this.
Signed-off-by: Dave Jones <davej@redhat.com>

into delerium.codemonkey.org.uk:/mnt/data/src/bk/cpufreq

reduce code duplication.

into delerium.codemonkey.org.uk:/mnt/nfs/neologic/bar/src/kernel/2.6/trees/cpufreq

Arjan noted that in some cases, the build fails.
This should fix it up.

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

This patch improves some of the handling of PA-RISC tulip cards.

 - Introduce HAS_SWAPPED_SEEPROM and NEEDS_FAKE_MEDIA_TABLE
 - Only trigger this code on GSC machines.  The pure PCI machines don't
   have these cards.
 - Allow the chip_name to be overridden in tulip_init_one().
 - Fix some indentation.
 - Handle the output from tulip_read_eeprom() better.

> From: Ralf Baechle <ralf@linux-mips.org>
> Subject: [PATCH] Stop queue on close in hdlcdrv
> To: Jeff Garzik <garzik@gtf.org>
> Date: Tue, 4 May 2004 13:59:15 +0200
>
> The stop method of a driver should ensure queueing is stopped ...
>
> diff -u -r1.19 hdlcdrv.c
> --- suckage/drivers/net/hamradio/hdlcdrv.c 12 Apr 2004 20:23:32 -0000

the above means the following is needed for my drivers - please apply to 2.6:

i386 gets it implicitly from somewhere but some architectures don't.
Also move <asm/uaccess.h> down so we have asm after linux headers.

s2io_rem_nic() is marked __exit and is being referred to from .data.
Signed-off-by: Andrew Morton <akpm@osdl.org>

From: "Luiz Fernando N. Capitulino" <lcapitulino@prefeitura.sp.gov.br>

drivers/net/ixgb/ixgb_main.c: In function `ixgb_intr':
drivers/net/ixgb/ixgb_main.c:1593: warning: unused variable `hw'
(catch by J. Cherry).

This happens because `hw' is only used when CONFIG_IXGB_NAPI is not set.
As `hw' is used only to have the code readable, we can use it for
!CONFIG_IXGB_NAPI too.
Signed-off-by: Andrew Morton <akpm@osdl.org>

into redhat.com:/spare/repo/net-drivers-2.6

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

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

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

into kernel.bkbits.net:/home/davem/bluetooth-2.6

Some RTX Telecom based USB dongles offer SCO support, but their
implementation is broken. This patch disables the use of the ISOC
interface for these devices.

If no channel is specified for a RFCOMM server socket, it will search
for the next free one and automaticly bind to it.

Proposed by Stephen Crane <steve.crane@rococosoft.com>

If no PSM is specified for a L2CAP server socket, it will search
for the next free one and automaticly bind to it.

Proposed by Stephen Crane <steve.crane@rococosoft.com>

This patch allocates the next free protocol number for the upcoming
HIDP support.

This patch updates the address of the BlueZ project and changes
some wording of the help entries.

Since we are using Bitkeeper the CVS tags are useless. This patch
removes them and makes some whitespace cleanups.

With Linux 2.6 there is no need to keep the function exports in a
central file and thus the use of syms.c makes no real sense. Remove
it and add the EXPORT_SYMBOL calls to the functions they belong to.

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

The timing calculations used by the PXA platforms did not always take
account of the timings handed to us by PCMCIA, and where it did, it
assumed IO timings for memory windows.

We fix this, and provide a generic function which calculates the
required timings (in nanoseconds) for IO, memory and attribute
windows.  The SOC drivers only have to convert this information to
whatever format the hardware requires to achieve at least these
timing parameters.

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

Some machines decided to initialise this element.  It's not necessary
since find_memend_and_nodes() initialises this itself.  However,
'end' is not required if we initialise high_memory in this function
rather than waiting until mem_init() is called.

From: Eugene Surovegin <ebs@ebshome.net>

Put back DECLARE_PCI_UNMAP_???  and friends accidentaly removed during DMA
API reorganization.
Signed-off-by: Eugene Surovegin <ebs@ebshome.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into kernel.bkbits.net:/home/davem/sparc-2.6

explcitly.

sparse doesn't set any arch defines itself.

Assigning '*wdata' with a dynamic initializer creates a
temporary structure copy on the stack, and then the final
data is initialized with a "memcpy()".

As a result, these NFS functions use more than 800 bytes
of stack-space.

Changing the code to just do a memset followed by explicit
initialization of the non-zero member variables takes the
stack usage down to 36 bytes. 

Here is a patch that does exactly that.