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

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

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

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

Both HFSC and CBQ leak unclassified skbs with CONFIG_NET_CLS_ACT.
Move freeing to enqueue where it belongs. Same change for in HTB/prio,
they just don't leak because they don't have unclassified packets.
Signed-off-by: Patrick McHardy <kaber@trash.net>

handle is computed wrong, this makes creating a filter not using
"from" fail.
Signed-off-by: Patrick McHardy <kaber@trash.net>

I believe that compilers are clever enough, but anyway...
Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

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

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

The continue is supposed to continue the outer loop, not break
out of the do { } while (0) loop. cls_route.c is also changed
in a similar way for clarity, although it behaved correctly.
Signed-off-by: Patrick McHardy <kaber@trash.net>

From: Roland McGrath <roland@redhat.com>

The fxsave instruction does not save the x87 tag word (only the
empty bits), and we re-created the old-style x87 tags incorrectly.
The registers are saved in "stack order" in the save area, but the
tag word bits are in "hardware order", and we need to get the right
register state.

Both x86 and x86-64 needed this fix.
Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off by: James Lamanna <jlamanna@gmail.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Marcel Sebek <sebek64@post.cz>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>

Anand Parthasarathy pointed out that draft-ietf-ipoib-ip-over-infiniband-09.txt says:

            [DISC] specifies the length of source/target option in
            number of 8-octets as indicated by a length of '3' above.
            Since the IPoIB link-layer address is only 20-octet long,
            two octets of zero MUST be prepended to fill the total
            option length of 24 octets.

The current Linux neighbour discovery code puts the padding after the
link address.  This patch fixes up ndisc.c to put the padding in the
correct place by adding a general ndisc_addr_option_pad() function
(which could be used in the future if someone ever implements RFC 3831
IPv6-over-FC or some other encapsulation that requires padding).
Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

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

1) move ip_nat_protocol_register/unregister since lock is now static.
2) fix ip_nat_snmp_basic: may not work, but now compiles.
Signed-off-by: David S. Miller <davem@davemloft.net>

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

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

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

Patch from Ben Dooks

Update default configuraiton, configure support for the
common flash chips seen on 2410 board.

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Ben Dooks

Add platform device for the onboard site for NOR flash,
similar to the Simtec BAST (EB2410ITX)

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Ben Dooks

Serial platfrom device to add ttyS0..ttyS4 to the
system.

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Ben Dooks

Add definition of the extra serial port area to the
file include/asm-arm/arch-s3c2410/vr1000-map.h

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Deepak Saxena

Previous fixed showed negative time flow every few hours during
extensive testing. This new version is much simpler and has been
tested w/o any failures.

Signed-off-by: Deepak Saxena
Signed-off-by: Russell King

Renaming ipx_opt to ipx_sock, tested with mars-nwe/ncpmount.
Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
Signed-off-by: David S. Miller <davem@davemloft.net>

into pobox.com:/garz/repo/net-drivers-2.6

Patch from Richard Purdie

Add MMC support to enable the MMC device on the corgi machines
(Sharp SL-C7xx). This is a standard PXA implementation except the
interrupt needs to be delayed to see card removals.
Applies after 2405/1.

Signed-off-by: Richard Purdie
Signed-off-by: Russell King

Patch from Richard Purdie

Add w100fb device definition to enable the framebuffer device on
the corgi machines (Sharp SL-C7xx).

Signed-off-by: Richard Purdie
Signed-off-by: Russell King

into pobox.com:/garz/repo/net-drivers-2.6

into pobox.com:/garz/repo/net-drivers-2.6

Patch from Giorgio Padrin

Completes/fixes I2S GPIO modes definitions in file pxa-regs.h .
Needed by sound drivers using I2S interface; based onofficial microprocessor documentation.

Signed-off-by: Giorgio Padrin
Signed-off-by: Russell King

Patch from Ben Dooks

Add platform device data for the NAND slot and chips
on the Simtec BAST (EB2410ITX) for the 3 chips
and SmartMedia slot.
Note, this does not yet support hot-plug for the
SmartMedia slot.

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Ben Dooks

Add call to find out the current source and destination
of the given dma channel

Signed-off-by: Ben Dooks
Signed-off-by: Russell King