From Chris Wedgwood.

SGI Modid: xfs-linux:xfs-kern:174817a
Signed-off-by: Nathan Scott <nathans@sgi.com>

correctly.  From Chris Wedgwood.

SGI Modid: xfs-linux:xfs-kern:174816a
Signed-off-by: Nathan Scott <nathans@sgi.com>

Removes a bit of dead code and a false positive from the Stanford
lock checker to boot.

SGI Modid: xfs-linux:xfs-kern:174815a
Signed-off-by: Nathan Scott <nathans@sgi.com>

after stricter compilation options used by some OSDL folks.

SGI Modid: xfs-linux:xfs-kern:174814a
Signed-off-by: Nathan Scott <nathans@sgi.com>

extent write.

SGI Modid: xfs-linux:xfs-kern:174810a
Signed-off-by: Nathan Scott <nathans@sgi.com>

in clear_inode path.

SGI Modid: xfs-linux:xfs-kern:174683a
Signed-off-by: Nathan Scott <nathans@sgi.com>

SGI Modid: xfs-linux:xfs-kern:174341a
Signed-off-by: Nathan Scott <nathans@sgi.com>

SGI Modid: xfs-linux:xfs-kern:174339a
Signed-off-by: Nathan Scott <nathans@sgi.com>

SGI Modid: xfs-linux:xfs-kern:174338a
Signed-off-by: Nathan Scott <nathans@sgi.com>

SGI Modid: xfs-linux:xfs-kern:174337a
Signed-off-by: Nathan Scott <nathans@sgi.com>

SGI Modid: xfs-linux:xfs-kern:174335a
Signed-off-by: Nathan Scott <nathans@sgi.com>

SGI Modid: xfs-linux:xfs-kern:174336a
Signed-off-by: Nathan Scott <nathans@sgi.com>

SGI Modid: xfs-linux:xfs-kern:174253a
Signed-off-by: Nathan Scott <nathans@sgi.com>

SGI Modid: xfs-linux:xfs-kern:174249a
Signed-off-by: Nathan Scott <nathans@sgi.com>

SGI Modid: xfs-linux:xfs-kern:174094a
Signed-off-by: Nathan Scott <nathans@sgi.com>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Fix stupid thinkos in the fcntl f_op removal code.

Tssk. 

Pointed out by Kai Makisara.

into intel.com:/home/lenb/src/linux-acpi-test-2.6.8

Fixes two common boot failures due to buggy SMM BIOS code

SMP boot crash if SMI_CMD=ACPI written from CPU1
http://bugzilla.kernel.org/show_bug.cgi?id=2941

laptop crash due to LAPIC timer before SMI_CMD=ACPI
http://bugzilla.kernel.org/show_bug.cgi?id=1269

into intel.com:/home/lenb/src/linux-acpi-test-2.6.8

Update lasi 82596 driver:
 - Fix boot messages (Helge Deller)
 - Whitespace and __FILE__ usage (Joel Soete)
 - 64-bit compile warning fixes (James Bottomley)

This trivial fix allows mounting MO-drives readwrite.

Acked by Jens.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 - __PAGE_OFFSET is 0x10000000 (Randolph Chung)
 - PA8800 support (Grant Grundler)
 - debuglocks (Thibaut Varene)
 - PDC chassis disabling (Thibaut Varene)
 - Distinguish between Dinos in request_irq (Thibaut Varene)
 - Document interrupt registers (Randolph Chung)
 - Revamp CONFIG_DISCONTIGMEM support (Randolph Chung)
 - Remove STI console warning and special casing (Randolph Chung)
 - n4000 defconfig (Randolph Chung)
 - iosapic fixes (Bjorn Helgaas)
 - Fix a bug in entry.S where pa_dbit_lock was being trashed (Randolph Chung)
 - SMP support (Randolph Chung, Grant Grundler, James Bottomley)
 - Clear the pte in the fault handler (Joel Soete)
 - Change _exit prototype (Carlos O'Donell)
 - Better unwinding support (Randolph Chung)
 - GCC 3.4 fixes (Carlos O'Donell, Randolph Chung)

The newly introduced ->fcntl file_operation is badly thought out,
not to mention undocumented.  This patch replaces it with two better
defined operations -- check_flags and dir_notify.  Any other fcntl()s
that filesystems are interested in can have their own properly typed
f_op method when they need it.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Patch from Marc Singer

The work already done to rectify the timer code initialization missed
a necessary change.  This patch adds a timer initialization function
to the LPD7A400 machine type.  It also makes a small correction to the
kernel configuration that is out of step with the machine specific
Kconfig.

Patch from Marc Singer

This patch aligns the lh7a40x port with the updated structure of IDE
drivers.  It also removes an unused FIQ handler.  This patch is made
in order to get the lh7a40x port to build.

Patch from Catalin Marinas

This patch replaces the -mshort-load-bytes option with $(call
check_gcc,-malignment-traps,-mshort-load-bytes) in the CFLAGS
setting in arch/arm/Makefile.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into kernel.bkbits.net:/home/davem/sparc-2.6