remove module_param's for wdt_start and wdt_stop
fix timeout check in init procedure

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

Make everything compile and boot again.

 - Update defconfig
 - Some minor cleanup
 - Introduce physid_t for APIC masks (fixes UP kernels)
 - Add bandaid for CardBus bridges and broken BIOS (Vojtech)
 - Add bandaid for unsynchronized TSCs  (Vojtech)
 - Fix ffs(0) return value (fixes XFS) 
 - Fix compilation with software suspend

synchronize_irq() requires an argument when built with CONFIG_SMP.

As discussed earlier. This implements Linus' idea of printing
the addresses in /proc/<pid>/maps as 32bit if possible.

This works around some broken 32bit programs that cannot parse
64bit addresses as generated by x86-64 kernels.

Also simplifies the code slightly.

CONFIG_ACPI_SLEEP doesn't compile without SOFTWARE_SUSPEND.
Make it select it automagically.

This fixes some bugzilla bug whose number I forgot.

export_ide_init_queue() and export_probe_for_drive()

also fix comment in init_irq()

From Benjamin Herrenschmidt <benh@kernel.crashing.org>.

From Mikael Pettersson <mikpe@csd.uu.se>.

From Stephane Ouellette <ouellettes@videotron.ca>.

From Mikael Pettersson <mikpe@csd.uu.se>.

From Duncan Laurie <duncan@sun.com>

This same patch made its way into 2.4 via the -ac tree but hasn't
been put in 2.6 yet.

It fixes some cable detect issues that stem from the fact that the
cable detect pins are also used as address/data lines, so they need
to first be configured as inputs to read valid cable detect state.

One more overlooked area where the proper process ID has to be used:
SysV IPC "pid" values should use the thread group ID, not the per-thread
one.

fix possible wafwdt_is_open race
make wdt_stop and wdt_start module params
change wd_margin to timeout and make it a module_param
make expect_close the same system as in advantechwdt.c
clean-up ioctl handling
added extra printk's to report what problem occured
add MODULE_DESCRIPTION info

general clean-up (comments, trailing spaces, ...)
Added WATCHDOG_NAME and PFX defines for easier printk's.
clean-up printk's.

small clean-up (add trivial comma)

sound/pcmcia/vx/vx_entry.c:

This patch removes the PCMCIA timer release functionality which is no
longer required. Without this the module does not compile.

Too much cut-and-paste, noticed by Dmitry Torokhov <dtor_core@ameritech.net>

into samba.org:/home/paulus/kernel/for-linus-ppc

On PPC32 we reorder the arguments so they fit into 6 registers.  Glibc will
need a two-line stub to change them from the standard order to the ordering
used by the system call: (fd, advice, offset, len).

into samba.org:/home/paulus/kernel/for-linus-ppc

into samba.org:/stuff/paulus/kernel/for-linus-ppc

into samba.org:/stuff/paulus/kernel/for-linus-ppc

into samba.org:/stuff/paulus/kernel/for-linus-ppc

into samba.org:/stuff/paulus/kernel/for-linus-ppc

In both 2.4 and in 2.6, error handling for bad cdrom media is
wrong.  And it is my fault I'm afraid, since I botched an earlier
fix for the problem by putting the fix in the wrong spot.

My kids have a "Jumpstart Toddlers" cd they have long since
completely killed, which makes a great test disc.  Without this
fix, the best time projection I can get for completing a dd type
sector copy is about 2 years...  Most of that is spent thrashing
about in kernel space trying to re-read sectors we already know
are not correctable....  After the fix, I was able to rip a copy
the CD (or rather muddle through it getting lots of EIO errors)
in about 15 minutes.

Attached is the fix for 2.6.x,

into samba.org:/stuff/paulus/kernel/for-linus-ppc