from 2.4

adap_lock is a little generic for a global..

This went into 2.4.18

Whoops, VIA goofed, and it reports L2 size as 65KB.

If we have a non-SMP approved CPU, but its in a UP system,
we should allow SMP kernels.

from 2.4
only register gameport if the port is active

from 2.4
only register gameport if the port is active

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

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

By Heiko Ronsdorf, has been around linux-kernel a few days, and has
been through some rounds of cleanup.

into tetrachloride.(none):/mnt/stuff/kernel/2.5/watchdog

updates.

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

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

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

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

Patch from Andreas Gruenbacher <agruen@suse.de>

This patch fixes an unbalanced lock_kernel()/unlock_kernel() path in the ext3
extended attributes code.  Instead of fixing this in fs/ext3/xattr_user.c,
the locking code is moved to fs/ext3/xattr.c, since most other types of
extended attributes will need the exact same functionality.

Growing i_size in hugetlbfs_prefault() isn't right - if we run out of pages,
do_mmap_pgoff() will chop the partially-instantiated pages off again.

So update i_size in hugetlbfs_file_mmap() if the whole mmap attempt was
successful.

Patch from john stultz <johnstul@us.ibm.com>

        This patch simply enables the existing timer_cyclone code for
Summit/x440 systems.

Patch from: john stultz <johnstul@us.ibm.com>

        This patch "fixes" the timer_cyclone code by having it
initialize fast_gettimeoffset_quotient and cpu_khz in the same manner as
timer_tsc. This is required for enabling the timer_cyclone code on the
x440.

Ideally fast_gettimeoffset_quotient would not be used outside timer_tsc
and cpu_khz would be initialized generically outside the timer
subsystem. I have patches to do this, but they touch quite a bit of
generic code, and I'd rather not make the timer_cyclone enablement
(patch to follow) depend on these larger changes.

Patch from: john stultz <johnstul@us.ibm.com>

This cleanup patch makes fast_gettimeoffset_quotient (a timer_tsc specific
variable) static, and replaces its usage with cpu_khz, making it timer_opt
independent.

Patch from: Rusty Lynch <rusty@linux.co.intel.com>

Attempting to cat a sysfs file that returns an error will result in an
endless dump of garbage to the screen because the result of the specific show
operation was being saved to a size_t (unsigned) and then later checked for a
negative value.

Here is a trivial patch to fix the error.

- hugetlbfs_forget_inode() should be using ||

Patch from: Ingo Oeser <ingo.oeser@informatik.tu-chemnitz.de>

Cure imm.c of the recent scsi core damage.

Patch from Neil Brown <neilb@cse.unsw.edu.au>

Initialise the queue's unplug_timer inside blk_queue_make_request.  This
makes the new auto-unplugging more accessable by other clients of
blk_queue_make_request - e.g.  raid5, umem.

This simplifies it and makes it more generic.

        o [FEATURE] Properly inline in wrapper Tx path
        o [FEATURE] Rewrite/simplify/optimise wrapper Rx path
                Lower CPU overhead *and* kernel image size
        o [FEATURE] Add ZeroCopy in wrapper Rx path for drivers that support it
                I'll update drivers later on...

        o [CORRECT] fix the secondary function to send RR and frames without
                the poll bit when it detect packet losses

                <Patch from Jan Kiszka>