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

Resided in arch/i386/kernel/dmi_scan.c and was not used by any of the 
blacklist functions. If it turns out to required, we can add it back later.

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

So make sure to include it in <asm-i386/hardirq.h> when needed
(ie for the CONFIG_PREEMPT case).

Fix up a few places where we marked __initdata as being const.

This causes a section conflict (init section vs .rodata)

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

constant values should not end up in the BSS.

We're better off having the compiler put it in the .rodata
section (which it will, thanks to the initializer and the
"const"), since that will result in it being nicely cacheable
in shared SMP caches.

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

use module_param, removed __setup code,
general cleanup (mostly of comments and trailing spaces, also removed include of config.h),
made the watchdog's timeout a module_param.

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

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

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

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

into samba.org:/scratch/anton/tmp3

into samba.org:/scratch/anton/tmp3

into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-power

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

into samba.org:/scratch/anton/tmp3

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

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

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

1. pci_device_id structures shouldn't be __devinitdata.  Greg removed
   all of the instances of this in the 2.6.0-test1 tree, but unforunately
   my recent coversion of lanai.c introduced another one.

2. The lanai PCI id constants have now been merged into the kernel headers
   so we don't need to define our own copies.

3. The ioctl's exported by lanai shouldn't be - they were intended for
   debugging only, never for release.  For now they're just '#if 0'ed out.
   They're somewhat dangerous since they don't check any capabilities so
   any user could DoS the interface.

Orginally from Pavel Machek.

- Create kernel/power/console.c
- Rename prepare_suspend_console() to pm_prepare_console() and 
  restore_console() to pm_restore_console().
- Add prototypes to include/linux/suspend.h.
- Make kernel/power/console.o dependent only on CONFIG_PM
- Simplify logic for SUSPEND_CONSOLE define
- Make software_resume() prepare console much earlier, so we can localize
  the loglevel variables in console.c. 
- Remove #ifdef CONFIG_VT from console.c, and just check for SUSPEND_CONSOLE.
  (Perhaps we should make entire file dependent on CONFIG_VT_CONSOLE?)
- Add kernel/power/power.h to share things across local files.

- Call blk_run_queues() from do_software_suspend() directly, instead of 
  wrapping it in helper function.
- Get rid of ominous compiler warning. 
- Change BUG_ON(in_interrupt()) to might_sleep() in software_suspend(), so
  we still get back trace, but don't actually BUG().

Orginally from Pavel Machek.

From: Leann Ogasawara <ogasawara@osdl.org>

Acked by Neil Brown.

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

The ARC and A5K machine class is handled by the arm26 architecture
now.  This cset removes the obsolete files from the 32-bit ARM
architecture.

ARM seems to have missed an update for the time keeping code; this
cset fixes a problem where the altering the system time changes the
reported uptime.