From: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>

From: Rene Herman <rene.herman@keyaccess.nl>

Prevent the disks from spinning down across a reboot.

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

Remove a local 1k array.

nfs/read.c: dynamically allocate the big structs

Patch from akpm

    gss context is (duh!) in seconds, not jiffies!

Patch by Bruce Fields

    unwrap procedures; otherwise they're going to
    be ridiculously long after we add privacy support.

Patch by Bruce Fields

    are defined.

Patch by Bruce Fields

    Clean up the interface to the GSSAPI code.
                                                                                
Patch by Bruce Fields

    generally useful. This will help prepare for the spkm3
    and lipkey mechanisms.

Patch by Bruce Fields

     makes existing ones consistent with other
     trace messages in the RPC client.
                                                                                
Patch by Chuck Lever

    when mounting an NFS filesystem.

RPC: Make "major" timeouts be of fixed length "timeo<<retrans"
     rather than counting the number of retransmissions. The
     clock starts at the first attempt to send each request.
                                                                                
RPC: Ensure that we "slow start" the RTT estimation after a
     major timeout has occurred.

    no longer calls the generic VFS read and write routines.
    This allows all application read requests to pass through
    to the server, instead of just the ones that appear to be
    inside the file. this eliminates the requirement to use a
    GETATTR operation before each read or write to determine
    where the EOF is. This is a significant performance and
    scalability win.

    It also removes all requirements for holding the inode
    semaphore during NFS direct reads and writes, as the read
    and write logic no longer needs atomic access to the size
    of the file. this also helps client CPU scalability by
    reducing the serialization of writes against a single file.
                                                                                
    Patch by Chuck Lever

    where NFS_I(inode)->data_updates can get out of sync
    with reality, which will lead to a BUG() in nfs_clear_inode
    later on.

    Patch by Olaf Kirch.

     seconds in order to avoid flooding of servers.

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

into austin.ibm.com:/shaggy/bk/jfs-2.5

In several functions, d_instantiate is called before the transaction
is committed.  Under the rare condition that txCommit fails, the new
inode is released, but the dentry continues to point to it.  This
can lead to a seg fault.  The fix is to call d_instantiate after
txCommit has run successfully.

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

The jfs_log structure was never being freed at unmount time.

The NFS readlink() methods all take a buffer length argument.  Use that
instead of assuming PAGE_SIZE... 

We need to return ENAMETOOLONG rather than EIO.

Make sure NFS client doesn't see errors from mode setting on new symlinks.

When nfsd creates a symlink, it tries to set the mode as the mode is 
carried in the NFS request and some filesystems store a mode.

If the filesystem refuses to set the mode (e.g. -EOPNOTSUPP), this
error should not be returned to the client.

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

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

This adds support for the CP-104 Moxa Smartio serial cards.  Just add
the PCI ID information.

When the kmem_bufctl_t typedef got added to include/asm-ppc64/types.h,
it got added outside the #ifndef __ASSEMBLY__ section, causing
assembler errors.  This patch, from David Gibson, moves it inside the
#ifndef __ASSEMBLY__ region.

Add newlines to some printk debug trace of comempci.c driver.

Remove a lot of un-used and un-needed libgcc funstions from export list
for m68knommu syms.

Correct build lines for Motorola Dragonball 68x328 frame buffer driver. 

Patch from Georges Menie <georges@menie.org>

Remove ColdFire specific code sections for atomic_add and atomc_sub.

These are not needed, the m68k asm code for these functions is ColdFire
clean.

We should un-define all the x86 style IO routines when redefining local
versions.

Create init points for the Motorola Dragonball 68x328 frame
buffer driver.

Patch from Georges Menie <georges@menie.org>