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

That's "cpu", not "cpy".

 - Add the PARISC tag (Thibaut Varene)
 - Mark some existing PA-RISC specific entries with it (Thibaut Varene)
 - Document pdcchassis (Thibaut Varene)

 - Fix "sti= parameter ignored by stifb" bug (Stuart Brady)
 - Fix the STI crash with HCRX-24 in 32bpp mode (Helge Deller)

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

Fix __init section usage:
rhine_resume calls enable_mmio, so latter cannot be __devinit;
Error: ./drivers/net/via-rhine.o .text refers to 0000000000000925 R_X86_64_PC32
.init.text+0xfffffffffffffffc
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

Description: Uses msleep() / ssleep() [as appropriate] instead of
schedule_timeout() to guarantee the task delays as expected.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

This patch adds a few memory barriers, cleans up a little bit the
use of the "status" field in the rx & tx routines, and adds probing
for the external PHY to the driver.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

This patch does an indentation fix to amd8111e_rx_poll() which was
incorrectly shifting left in the middle of a while() loop, thus
rendering the function difficult to read. There is no actual code
change.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

My intel.com address will bounce.
Signed-off-by: Scott Feldman <sfeldma@pobox.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

It looks like this bit got mismerged (pci.h removed but DMA arguments
convertion missing).
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

ARM udelay can't cope with >2ms delays.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

into pobox.com:/garz/repo/libata-2.6

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

Since bit 0 is only set when the MM is mapped onto the CPU, we can use
this rather than comparing the MM pointer with current->active_mm.
This simplifies the inline cache flushing and tlb code.

Christoph suggests letting the compiler choose.  No real compelling reason
to inline anyhow.  I had some vmlinux size numbers suggesting inline was
better, but re-running them on newer kernel is giving different results,
favoring uninline.  Best let compiler choose.  Un-inline __sigqueue_alloc.
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

From: Jens Axboe <axboe@suse.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

destroy_proc_ide_interfaces is only used inside ide-proc.c;
so lets make it static.
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

cs5530 overrides hwif->autodma anyway.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Do not set hwif->autodma in ide_pci_setup_ports().
All DMA capable PCI host drivers override it.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

* hwif->dma_base is set in ->init_iops() for MMIO
* if !dma_base then dma_base is really equal to zero
* remove dead code from simplex check
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

DMA is always used by default (->autodma is never checked).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Original patch from Mark Lord <lkml@rtr.ca>.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

We need to k[un]map_atomic() the current page not the first page
of the scatterlist segment.  Fixes OOPS when using HIGHMEM.

Big thanks to Randy Dunlap for a lot of debugging/testing.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

This avoids a bug where the compiler would overwrite the
stackframe that the caller also considered to be a register
save area.

It also shrinks the code segment by a tiny amount by moving
the failure case argument setup into the slow path. This not
only makes the fast path smaller, but it makes it easier on
gcc (gcc is not very good at generating code that uses fixed
register names).

This file is no longer reqired - the MAKEDEV program makes the ida/ nodes
automatically.
Signed-off-by: James Nelson <james4765@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

General cleanup of Documentation/cpqarray.txt.  Removal of old and obsolete
references, removed references to an external patch.
Signed-off-by: James Nelson <james4765@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>