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.

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

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

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

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

breaks everybody else.

Instead, fix the NOMMU case by avoiding the part that walks page
tables.

 - fix VIDIOC_S_FBUF for v4l1 backward compatility with xfree86 / v4l_drv

 - some progress on DVB-C analog module: experimentally fix frequency
   offset, initialize msp3400 for analog TV sound
 - Reduce the number of dropped TS packets when an error is detected
   (Jon Burgess)
 - If somebody calls G_TUNER for a DVB-C card w/ analog module, then
   check for the selected tuner, not if the currently selected channel
   has a tuner.
 - play_iframe may be used to play stillpicture frames, that can either
   by complete i-frames or partial p-frames.  In any case, the av7110
   needs about 400kB of video data, before the internal video decoder
   starts displaying anything.  for stillframes, this is bad, so we
   *always* loop writing the frame until the magic amount is reached.
   stupid, but works... 
 - applied 64bit fixes by Pedro Miguel Teixeira <pmsjt@warner.homeip.net

 - split up saa7146 compilation in core part (saa7146.o) and video+vbi
   part (saa7146_vv).  some drivers need both (av7110.c), some drivers
   only need the core stuff (budget*.c)
 - add entry for sp887x DVB-T modulator to corresponding Kconfig
 - use new SELECT facility of Kconfig, first mentioned by Adrian Bunk
   and Roman Zippel in DVB subsystem
 - use SELECT in media/video/Kconfig, too.

 - add budget driver as possible client of the ves1820 frontend driver
 - fix wrong include in sp887x.c frontend driver
 - fix wrong chip description in tda1004xh frontend driver
 - fixed detection of stv0299 if chip is in standby mode
 - change some #ifdef to #if, for easier debug enable/disable
 - ves1820: patch by Peter Bieringer: nicer log output
 - ves1820: allow PWM (tuner calibaration) value from EEPROM to be
   overridden on command line (based on patch by Peter Bieringer).  New
   module paramters: "pwm" (max 4 ints, range -1..0xff) and "verbose"
   (to print AFC value aftger tuning).

 - various av7110 updates

 - patch by Jon Burgess to fix DMA issues
 - reduce the number of dropped TS packets when an error is detected
   (Jon Burgess)
 - use budget-ci driver for new TT DVB-T cards with onboard MSP430.

 - the usual c99 initialization fixes all over the DVB place