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

The NTTY code can get confused by 4kB chunks, apparently
because n_tty_receive_room() will claim to have more room
than n_tty_receive_buf() can actually accept.

Until somebody figures out what the real n_tty_receive_room()
logic should be, let's just limit it to a safe 2kB.

Thanks go to Andreas Schwab for finding a test-case.

cg3_blank() needs to clear the video enable register bit
to blank the screen, not set it.
Signed-off-by: David S. Miller <davem@davemloft.net>

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

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

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

Add some missing __iomem annotations for Integrator machines.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>

This adds some missing annotations found by making the raw IO
operations check their pointer type.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Patch from Ben Dooks

Fix the following:
arch/arm/mach-ixp2000/pci.c:148: warning: `cli' is deprecated (declared at include/linux/interrupt.h:65)
arch/arm/mach-ixp2000/pci.c:161: warning: `sti' is deprecated (declared at include/linux/interrupt.h:69)
arch/arm/mach-ixp2000/pci.c:178: warning: `cli' is deprecated (declared at include/linux/interrupt.h:65)
arch/arm/mach-ixp2000/pci.c:191: warning: `sti' is deprecated (declared at include/linux/interrupt.h:69)
By replacing cli() wht local_irq_save() and sti() with local_irq_restore().
This patch has not been tested.

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

Patch from Ben Dooks

Fix the following:
arch/arm/mach-ixp4xx/common.c:305: warning: initialization from incompatible pointer type

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

It is defined as a _IOW() which is erroneous, it should
have been defined as _IORW() but that cannot be changed
now without breaking all existing applications using this
ioctl.
Signed-off-by: David S. Miller <davem@davemloft.net>

this oneliner fixes the situation that I can enter a year to blacklist
ACPI devices even if ACPI is completely disabled.
Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

When the lockfs patches went in an important bit got lost, the call in
generic_file_write to put newly incoming writers to sleep when a filesystem
is frozen.  Nathan added back the call in the now separate XFS write patch,
and the patch for the generic code is below:
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The size of LAN bridged messages was not being returned properly from the
function that calculated address sizes.
Signed-off-by: Corey Minyard <minyard@acm.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

unifdef complains about the space before #ifndef.
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

isdn_net_get_locked_lp is doing a local_bh_enable with hard IRQs disabled. 
This is not allowed.

The following patch fixes the problem by removing the unnecessary
local_bh_enable while the hard IRQs are disabled.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
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 Thomas Gleixner

Remove NULL initializers of static variables.

Signed-off-by: Thomas Gleixner
Signed-off-by: Russell King

Patch from Thomas Gleixner

Trivial build fix for shannon platform

Signed-off-by: Thomas Gleixner
Signed-off-by: Russell King

Patch from Thomas Gleixner

Trivial build fix for badge4 platform

Signed-off-by: Thomas Gleixner
Signed-off-by: Russell King

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

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

Fixes MDIO delay. Please apply.
Signed-off-by: Ralph Siemsen <ralphs@netwinder.org>
Signed-off-by: Matt Porter <mporter@kernel.crashing.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

Fixes a bug in RX buffer allocation so that jumbo size skbs are
allocated when the MTU size is changed. Also removes the deprecated
restore_flags() call.  Please apply.
Signed-off-by: Matt Porter <mporter@kernel.crashing.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

Really.

This makes it possible to mark binaries to have both an executable stack
and heap, allowing for a NX system to disable NX on a per-binary level.
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The dynamic clock code in radeonfb comes almost as-is from X.org (where
it was contributed by ATI). It has a few typos (wrong register access
macros) that this patch fixes.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

A simple 'grep memset.*\<0);' shows argument order errors in several
uses of memset.

This grep was inspired by Al Viro's recent patch, megaraid_mbox fix,
which fixed this problem in the megaraid driver.

This removes the CRs from the kernel file of Eicon ISDN driver.

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

Patch from Ben Dooks

Off by 4 error on S3C2440_CAMDVIN register address, and
re-indented the pll calculation code to proper C style.
Thanks to Guillaume Gourat for spotting the register mistake

Signed-off-by: Guillaume Gourat

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

Patch from Ben Dooks

GPIOJ12 alternate function is CAMRESET, not CAMCLKOUT
as mis-copied on creation
Patch from Guillaume Gourat

Signed-off-by: Guillaume Gourat

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

Patch from Lennert Buytenhek

The alignment trap handler in arch/arm/mm/alignment.c performs halfword
and word accesses by translating them into byte accessing and then
combining the pieces.  However, it assumes little-endian byte ordering
in doing so, which causes unaligned accesses on big-endian platforms
to erroneously load or store byteswapped data.
This patch was pulled from an old 2.4 -ds tree, and appears to fix the
issue.  It was submitted for 2.4 at the time (ARM patch ID 1205/1206),
but rejected since big-endian ARM platforms are not supported in 2.4.

Signed-off-by: Lennert Buytenhek
Signed-off-by: Russell King

For device memory, just return a value that will never
cause pte_pfn() to return true.

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

for pinned inodes.

SGI-PV: 930364
SGI-Modid: xfs-linux-melb:xfs-kern:21460a
Signed-off-by: Nathan Scott <nathans@sgi.com>

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