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

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

This just disables some drivers which are clearly not 64bit clean from
the configuration for CONFIG_64BIT hosts.

Partly from Arnd Bergmann.

From Arnd Bergmann.

Various APIC/ACPI fixes for x86-64. This brings us closer to working
out of the box on the now popular VIA and NVidia Nforce3 based Athlon64
and Opteron boards. To be really good we would need more ACPI changes
(still waiting for that to be all merged through the usual channels).

With this we mostly work with acpi=off at least.

Also it syncs us up with bugfixes done in 2.4.

 - Disable IO-APIC by default on non SMP VIA/NVidia boards.  This is a
   bit of a hack, but needed to work around ACPI bugs.  Can be
   overwriten with "apic". 
 - Add acpi=ht, meaning run ACPI boot setup, but do not enable the
   interpreter.  Same as i386.
 - Stop MADT parsing early when local APIC or IO-APIC are disabled
 - Add more option parsing early enough to actually change the boot
   process
 - Update documentation for command line options

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

Patch from Bjorn Helgaas

Intel 870 firmware reports an extra zero-length IO port range, which
is bogus, as far as I can tell.  Ignore it.

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

Patch from Yves Rutschle.

This cset allows LART to build again.

into kernel.crashing.org:/home/trini/work/kernel/pristine/for-linus-ppc

into kernel.crashing.org:/home/trini/work/kernel/pristine/for-linus-ppc

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

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

This allows PPC to insert resource descriptors later on after boot.

Mostly from Sam Ravnborg <sam@ravnborg.org>.

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

into shaggy.austin.ibm.com:/home/shaggy/bk/jfs-2.5

into kernel.bkbits.net:/home/mochel/linux-2.5-core

From Ethan Benson <erbenson@alaska.net>.

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

the online backup tools.

this correctly

This patch replaces many assert statements, which caused a BUG(), with
improved code to mark the superblock dirty and then proceed as specified by
the errors= mount flag (as ext2 and ext3 do).  JFS's default for the errors
option is "remount-ro" in order to prevent addition data corruption when a
problem is found.

These asserts are usually triggered by on-disk data corruption.  By marking
the superblock dirty, fsck will perform a complete check on the file system
and correct the problems, rather than simply replaying the journal, inviting
later trouble.

Submitted by Karl Rister & Dave Kleikamp

into penguin.americas.sgi.com:/src/lord/bitkeeper/xfs-2.6

Replace read/write lock used for HPET timer monotonic_lock with seqlock.
Similar to locking used on xtime and monotonic_lock in timers/timer_tsc.c

Replace read/write lock used for cyclone timer monotonic_lock with seqlock.
Similar to locking used on xtime and monotonic_lock in timers/timer_tsc.c

SGI Modid: 2.5.x-xfs:slinx:159631a

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

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