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

The free_netdev fixes in 2.6.0-test4 broke drivers/net/wan/cosa.c.
This fixes it.

The current cu3088 ccwgroup write code overwrite the last char of the
given arguments.  This fixes the problem.  It is been tested and applies
on latest bk.

Somewhere in the transition of task queue to the work queue, in
stallion.c, some of the schedule_task were left out from being converted
to schedule_work.  This fixes it.

	I wrote this driver a long time ago, and now, playing with my
brand new PARISC machine I found these problems, could you please apply
this patch?

	Ah, the "& more" refers to some alignment problems also solved
in this patch.

This patch removes the PCMCIA timer release functionality which is no
longer required (or supported).

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.