This cleans up arch/ppc/kernel/traps.c and vecemu.c to use the same
formatting style for all functions, and fixes 2 warnings in the altivec
floating point emulation code.  No functional change. 
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Certain early SATA drives have problems with write requests whose
length satisfy the equation "sectors % 15 == 1", on the SiI 3112.
Other drives, and other SiI controllers, are not affected.

The fix for this problem is to avoid such requests, in one of three
ways, for the affect drive+controller combos:
1) Limit all writes to 15 sectors
2) Use block layer features to avoid creating requests whose
   length satisfies the above equation.
3) When a request satisfies the above equation, split the request
   into two writes, neither of which satisfies the equation.

I chose fix #1, the most simple to implement.  After discussion with
Silicon Image and others regarding the impact of this fix, I have
decided to remain with fix #1, and will not be implementing a
"better fix".  This means that the affected SATA drives will see
decreased performance, but set of affected drives is small and will
never grow larger.

Further, the complexity of implementing solution #2 or
solution #3 is rather large.

When implementing lba48 'large request' support, I unintentionally
broke the fix for these affected drives.  Kudos to Ricky Beam for
noticing this.

This change restores the fix, by adding a flag ATA_DFLAG_LOCK_SECTORS
to indicate that the max_sectors value set by the low-level driver
should never be changed.

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

Patch from David Vrabel

Missing include (cf. include/asm-i386/checksum.h) in include/asm-arm/checksum.h.

Patch from Ian Campbell

The SA1100 watchdog driver also works fine on the PXA2xx. Tested on 
a PXA255 based platform.

Patch from John Lenz

Switches the collie framebuffer mach_info structure to use
the new initializers.
Signed-off-by: John Lenz <jelenz@students.wisc.edu>

Patch from John Lenz

The __sa1111_probe function is declared __init, and it is called from
the sa1111_probe function, which is not declared __init.
Signed-off-by: John Lenz <jelenz@students.wisc.edu>

into flint.arm.linux.org.uk:/usr/src/bk/linux-2.6-rmk

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

Patch from Ian Campbell

Patch 1848/1 removed the hack for preserving FFUART over sleep.

This patch adds back that support in the correct place by converting
the PXA serial driver to use the driver model and hooking up the 
suspend and resume methods.

Patch from Marc Singer

Serial console and port driver for the LH7a40x CPUs.  The only change
made since the last patch was to change the PORT_ID (again).  This
patch superceeds two serial driver patches.

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

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

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

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

Signed-off-by: Arthur Kepner <akepner@sgi.com>
Signed-off-by: David S. Miller <davem@redhat.com>

Put it in per-esp data instead.  Noticed by Linus.
Signed-off-by: David S. Miller <davem@redhat.com>

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

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

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

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

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

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

Also clean it all up - use get_cpu()/put_cpu() instead of
playing games by hand with preemption.

Here is a simple patch which drops some out-of-date code in the w83781d
and w83627hf i2c chip drivers. These bits are left over from the times
when chip drivers were setting default limits at init.


Signed-off-by: Jean Delvare <khali at linux-fr dot org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

into kroah.com:/home/greg/linux/BK/driver-2.6

Al missed this one in his sparse fixes
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Mika Kukkonen <mika@osdl.org>
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Mika Kukkonen <mika@osdl.org>
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Mika Kukkonen <mika@osdl.org>
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The poor cousins also need this, LLC will be the first to use it.
Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>

Renaming it to sk_stream_moderate_sndbuf, further patches will move
all the tcp memory pressure handling support into net/core/stream.c
to make them usable by the poor cousins, starting with LLC.
Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>

Will be used by the poor cousins
Signed-of-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>