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

the online backup tools.

this correctly

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

 - fix copyright stuff in various files:
   - remove e-mail addresses that don't exist anymore, but of course keep
     the names
   - change license from GPL to LGPL in dvb_i2c.h (Convergence code)
   - change license from GPL to LGPL in dvb_ringbuffer.h (ack by original
     author Oliver Endriss)
   - add LGPL license to dvb_functions

 - allow multiple read device opens

 - some Kconfig simplifications
 - FIELD_ALTERNATE capture was broken, add a "wait for vbi" command
   before actually waiting for the field change
 - improvements regarding streaming capture to gfx card memory.
 - captured frames could only be page aligned.  fixed.
 - fix pgtable_build_single, it should work for all kinds of buffers now
   (system memory (kernel/user) and gfx-memory)
 - Fix bytesperline-calculation for V4L2_FIELD_ALTERNATE vs.
   V4L2_FIELD_INTERLACED capture

 - add new DVB-T frontend driver sp887x.c

 - av7110 DVB driver firmware update.  don't worry: we're planning to
   switch to firmware_class soon...

It's a pain for architecture maintainers to keep the toplevel Kconfig
files in sync.  This addresses part of the problem by moving all the
standard driver includes to drivers/Kconfig.  As a bonus, it moves all
the device drivers together in a menu which tames menuconfig somewhat.

This patch only touches i386.  Other architectures can join the party
as soon as they feel ready to inflict all the choices on their userbase.

This does two things:

 (1) Move the v850 platform-specific linker-script fragments into
     arch/v850/kernel, from arch/v850.  This move was prompted by a
     recent (all-architecture) move for vmlinux.lds.S, to keep the
     script together, but I think it also makes sense -- this way, all
     platform-specific non-header files are in the same directory with
     similar names.

 (2) Remove some hardwired constants in the linker script fragments,
     using already defined cpp macros anyway.  This eliminates one
     annoying source of duplicate definitions (which had to be kept in
     sync).

This function doesn't compile on non-MMU systems, so put it in a place
where it won't cause problems (mm/memory.c is only compiled if
CONFIG_MMU is defined).