- revert accidental reversion of the timer initialisation in fbcon.

- init a timer in drivers/net/pcmcia/fmvj18x_cs.c
  (OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>)

When testing the XFS 1.2 release we found a problem that was caused
by inodes made unusable by make_bad_inode() still beeing returned by
iget() and friends.  The workaround was to call remove_inode_hash()
before each call to make_bad_inode().

I think the proper fix is to let make_bad_inode() remove the inodes
from the hash chains.

into samba.org:/scratch/anton/linux-2.5_ppc64_work

into samba.org:/scratch/anton/linux-2.5_ppc64_work

into samba.org:/scratch/anton/linux-2.5_ppc64_work

This converts the PA-RISC PS/2 keyboard & mouse driver to the input
layer.  New driver written by Laurent Canet & Thibaut Varene.

Fix the documentation to match the code fix.

    "static structi2c_clientclient_template" works much better
when spaces are added at appropriate places.

into home.transmeta.com:/home/torvalds/v2.5/linux

Without this, time runs 50x too slow after resume, since nothing
knows to tell the timer to re-initialize.

Here are a few fixes I needed when porting oprofile to ppc64:

 - __PAGE_OFFSET isnt defined for all architectures, use PAGE_OFFSET
   instead
 - include linux/cache.h everywhere we use ____cacheline_aligned etc.
   Otherwise we end up with a structure called ____cacheline_aligned
   and no alignment :(

This changes sys_getppid() to be more POSIX-threading conformant.

sys_getppid() needs to return the PID of the "process' parent" (ie.  the
tgid of the parent thread), not the thread parent's PID.  The patch has
no effect on non-CLONE_THREAD users, for them current->group_leader ==
current.  The effect on CLONE_THREAD threads is that getppid() does not
return any PID within the thread group anymore.  Plus if a threaded
application starts up a (non-thread) child then the child sees the
process PID of the parent process, not the thread PID of the parent
thread.

in theory we could introduce the getttid() variant to get to the TID of
the parent thread, but i doubt it would be of any use.  (and we can add
it if the need arises.)

The lockless algorithm is still safe because the ->group_leader pointer
never changes asynchronously.  (the ->real_parent pointer might still
change asynchronously so the SMP checks are still needed.)

I've also updated the comments (they referenced the nonexistent p_ooptr
field.), plus i've changed the mb() to rmb() - we need to order the
reads, we dont do any global writes that need some predictable ordering.

into home.transmeta.com:/home/torvalds/v2.5/linux

into home.transmeta.com:/home/torvalds/v2.5/linux

This removes the include of (the now empty) Rules.make, gets rid of the
ifndef clause and fixes the indentation.

This fixes threaded coredumps and streamlines the code.  The old code
caused crashes and hung coredumps.  The new code has been tested for
some time already and appears to be robust.  Changes:

 - the code now uses completions instead of a semaphore and a waitqueue,
   attached to mm_struct:

        /* coredumping support */
        int core_waiters;
        struct completion *core_startup_done, core_done;

 - extended the completion concept with a 'complete all' call - all pending
   threads are woken up in that case.

 - core_waiters is a plain integer now - it's always accessed from under
   the mmap_sem. It's also used as the fastpath-check in the sys_exit()
   path, instead of ->dumpable (which was incorrect).

 - got rid of the ->core_waiter task flag - it's not needed anymore.

Update Stelian Pop's contact information in CREDITS and MAINTAINERS.

This corrects a small typo in the previous patch (in the ZOOM button
definition) and adds events generated by the Memory Stick reader on VAIO
U3 laptops (thanks to Kunihiko IMAI).

into hera.kernel.org:/home/hch/BK/xfs/linux-2.5

into nuts.ninka.net:/home/davem/src/BK/sparc-2.5

into kroah.com:/home/linux/linux/BK/pci_hp-2.5

into kroah.com:/home/linux/linux/BK/gregkh-2.5

From Pengcheng Zou <pczou@redflag-linux.com>:
>
> Orignally DN_MODIFY is issued on readv while DN_ACCESS is issued on writev,
> which is obviously wrong. This patch fixes such problem.

This is the equivalent patch for 2.5.50+.