Enable the Hammer specific events by giving the correct cpu string.
From, and tested by, Will Cohen.

into home.osdl.org:/home/torvalds/v2.5/linux

into home.osdl.org:/home/torvalds/v2.5/linux

    The thread for was unneeded on chips other than CH_8139_K/8129. So,
    this patch doesn't create the thread on chips other than
    CH_8139_K/8129.

Harmless in 2.4, but causes oopses on rmmod in 2.6.

slab poisoning can take care of this for us, anyway.

into redhat.com:/spare/repo/net-drivers-2.6

* removed ancient-kernel compat code from sk_mca.h.  I leave
  it to janitors to remove the now-useless SKMCA_xxx wrappers.
* removed ancient-kernel compat code from sk_mca.c.
* s/SKMCA_NETDEV/net_device/
* fixed static net_device initialization (this will go away
  when dynamic-alloc patches land)

Anybody with hardware, that can test this driver?

While it would be nice to keep using the generic version of RODATA, the
v850's linker-script structure is sufficiently different from that of
typical archs that it's not possible to use RODATA as it's currently
defined.  I earlier suggested splitting the generic definition of RODATA
into `RODATA_CONTENTS' and `RODATA' (a wrapper around RODATA_CONTENTS)
where most archs would use RODATA, and the v850 would use
RODATA_CONTENTS, however Kai didn't like that idea.

It _may_ be possible to rewrite the v850's linker scripts into something
more typical (using lots of individual output sections), but it doesn't
seem at all straightforward, so I don't have the time to do it right
now.

Anyway, this is the short-term work-around so that Linus's kernel works
on the v850.

o driver support headers update
o fix warnings

typo fixed.

In order to bring the 2.4 and 2.6 versions in sync, here is the
missing bit for the meye driver :)

This updates the sonypi driver to the latest version:
        * document the fact that FX501/FX702 laptops are not supported

        * add battery insert/remove events (thanks to Daniel K.)

        * improve the event detection using a different port offset
          on 'type2' models (thanks to Daniel K.)

into home.osdl.org:/home/torvalds/v2.5/linux

Atari floppy: Add missing includes and remove some unnecessary includes

M68k: Set last in switch_to(), fix asm constraints (from Andreas Schwab)

Amiga floppy: Add missing includes and remove some unnecessary includes (from
Roman Zippel)

Amiga z2ram: Add missing includes and remove some unnecessary includes

M68k: asm/local.h just includes the generic version (from Roman Zippel)

M68k: asm/sections.h just includes the generic version (from Roman Zippel)

Bartlomiej Zolnierkiewicz:
>   o ide: disk geometry/capacity cleanups
>   o ide: always store disk capacity in u64

Forgot to update the Macintosh IDE driver:

Kai Germaschewski:
>   o kbuild: Move generation of vmlinux.lds.s into arch/.../kernel

This forgot to move two files:

    mv arch/m68k/vmlinux-std.lds arch/m68k/kernel
    mv arch/m68k/vmlinux-sun3.lds arch/m68k/kernel

into hostme.bitkeeper.com:/repos/l/linux-watchdog/linux-2.5-watchdog

Add "ALi M1535 PMU Watchdog Timer" driver

clean-up of comments, trailing spaces, includes, ...
removed unnecessary spinlocking
added WATCHDOG_NAME + PFX defines for easier printk's
clean-up expect_close / acq_is_open
made wdt_stop and wdt_start a module_param
clean-up ioctl handling
clean-up init and exit routines
added MODULE_AUTHOR + MODULE_DESCRIPTION info

fix MODULE_PARM_DESC for timeout
add WDIOC_SETOPTIONS functionality

added the exclusion between ADD_PARTITION/DELETE_PARTITION/open() (BLKPG
ioctls didn't grab ->bd_sem when they should have).

added bdev->bd_part; it is set at open() to point to the hd_struct of
partition in question, reset on final close.

blk_partition_remap() uses ->bd_part instead of the current mess

  ->bd_offset is gone, we use ->bd_part->start_sect instead

added missing ->release() to hd_struct kobject, moved kfree() into it

  ->bd_part cotributes to refcount of hd_struct - we bump it when

  ->bd_part is set and drop when it's reset.

new helper - imajor(inode)

new helper - iminor(inode); defined as minor(inode->i_rdev); lots and
lots of places in drivers had been switched to it.

struct block_device made the private part of bdevfs inodes; bd_count
is gone, we use ->i_count of inode now; separate hash is also gone and we
are using iget5_locked()/igrab()/iput() instead.

Now that floppy_open() stores bdev in opened_bdevs[drive], we can remove
crap from floppy_read_block_0() and have it use that bdev instead of
messing with bdget_disk()/setting ->bd_disk by hand/bdput().

removed dead code from sparc64 hugetlbpage.c

 - hpfs_unlink() should not try to truncate the victim unless it's a
   regular file; truncate will not help for anything else and it will
   screw the page cache if victim happens to be a block device.
 - network filesystems should *not* invalidate page cache of block
   device node when inode gets invalidated; fixed, added a new helper -
   invalidate_remote_inode(). 
 - nfs setattr syncs the file before sending SETATTR to server; that
   makes a lot of sense for regular files, but not for anything else.
   Fixed.

removed bogus uses of ->i_sb->s_dev in intermezzo (comparizons can and
should simply compare ->i_sb, printks should use ->s_id).

jffs used to put kdev_t values on disk - blind copy of in-core
representation.

Switched to explicit use of u16 (which is what kdev_t currently is),
with appropriate conversion