Signed-off-by; Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

 There is a problem with "struct fddi_statistics" for 64-bit systems.
The starting members of the struct are expected to correspond to the
respective members of "struct net_device_stats" (drivers for FDDI
devices return "struct fddi_statistics" in the response to the
get_stats() call of "struct net_device").  Unfortunately, due to using
different types (u32 vs ulong) they do not.  "struct net_device_stats"
is a public interface and as a result, bogus results are retrieved,
e.g. for /proc/net/dev.

 Here is my proposal to address the problem.  I think there is no
point in duplicating the layout of "struct net_device_stats" in
"struct fddi_statistics" as the former can simply be included as a
member avoiding this problem and actually any possible discrepancy in
the future.  This also preserves the layout of the structure for
32-bit systems.
Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

This patch from Herbert V. Riedel <hvr@gnu.org> adds __initdata to the
generic AES code where appropriate.  I also added __init to f_mult().
Signed-off-by: Herbert V. Riedel <hvr@gnu.org>
Signed-off-by: James Morris <jmorris@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Fix a race between neigh_timer_handler() calling down to arp_solicit()
with an sk_buff peeked from the head of the neigh->arp_queue, and
neigh_event_send() unqueuing and freeing the head of the same queue
because it's reached the maximum length of 3, by taking an extra
sk_buff reference while holding neigh->lock.
Signed-off-by: Greg Banks <gnb@melbourne.sgi.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Here is the patch from Justin Ossevoort <justin@snt.utwente.nl> to fix 
endian problem on IPVS sync message size.
Signed-off-by: David S. Miller <davem@davemloft.net>

The I2C adapter wasn't de-registered correctly in case the video card
wasn't found.  When the I2C subsystem tried to speak with the dangling
I2C adapter later on, usually an oops happened.

Roman Zippel submitted this to lk but I missed it, it does
what I tried to do badly before.
Signed-off-by: Dave Airlie <airlied@linux.ie>

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

Patch from Ben Dooks

Fixed GPG pin numbering, and missing changelog

Added code to setup the interrupt filtering on
compatible Pins

Signed-off-by: Ben Dooks

Patch from Ben Dooks

Header file defining S3C2410 SPI registers

Signed-off-by: Klaus Fetscher 
Signed-off-by: Ben Dooks 

Patch from Ben Dooks

Added documentation for the GPIO calls, updated
the overview with more information on the supported
core devices, and updated the state of the EB2410ITX

Signed-off-by: Ben Dooks 

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

Signed-off-by: David S. Miller <davem@davemloft.net>

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

Al suggested a sparse warning. And sure enough, it found
these ones.

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

The attached patch makes s390 sclp driver buildable again.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Patch from Ben Dooks

Add definitions to the MISCCR register for configuration
of the signal states in power down mode.

Signed-off-by: Ben Dooks 

Patch from Ben Dooks

Include file include/asm-arm/arch-s3c2410/regs-iic.h,
for the I2C controller on the S3C2410 Samsung SoC.

Signed-off-by: Ben Dooks

Patch from Ben Dooks

Header file include/asm-arm/arch-s3c2410/regs-mem.h containing
definitions for the S3C2410 memory controller

Signed-off-by: Ben Dooks 

Patch from Dave Jiang

Latest IQ80331 redboot changed value of ATU registers and is causing master aborts on the plugged in card. Changing value back to previous sane state for Linux.

Signed-off-by: Dave Jiang (dave.jiang@gmail.com)

Patch in replacement of 2099/1 due to formatting problems.

Some compilers seem to get "%?" wrong in macros.

We really need to check that we have access to the whole of the
signal frame when we allocate it, rather than "most of it" when
we have iWMMXt extensions selected.

- Use ISA_DMA_THRESHOLD as the mask for GFP_DMA allocations.
- Don't allow DMA allocations which are for a "smaller" mask than
  ISA_DMA_THRESHOLD.
- Ensure that "handle" is initialised to our error value when
  returning an error.

Add locking for use of kecardd services.
Use wait_event_interruptible() rather htan interruptible_sleep_on().

Patch from Ben Dooks

Fix missing changelog entries in <asm-arm/arch-s3c2410/hardware.h>,
and erroneous EINT definitions in <asm-arm/arch-s3c2410/regs-gpio.h>.

Added s3c2410_gpio_getcfg(pin) and s3c2410_gpio_getirq(pin)
to get the current configuration of an pin, and which IRQ
(if any) maps to it.

Signed-off-by: Ben Dooks 

Patch from Ben Dooks

USB power control and over-current sense

Signed-off-by: Ben Dooks 

Patch from Ben Dooks

Port power control and management for S3C2410 internal
USB controller for different boards to interface their
power control system to.

Signed-off-by: Ben Dooks 

Patch from Sascha Hauer

This patch fixes the i.MX timer functions:
- imx_gettimeoffset() now returns proper values
- fix timer interrupt frequency

Signed-off-by: Sascha Hauer 

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

into coreworks.de:/home/kaber/src/net/net-2.6

Signed-off-by: Patrick McHardy <kaber@trash.net>

Signed-off-by: Patrick McHardy <kaber@trash.net>

Signed-off-by: Patrick McHardy <kaber@trash.net>