into nuts.davemloft.net:/disk1/BK/tg3-2.6

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

From: Ivan Kokshaysky <ink@jurassic.park.msu.ru>

This allows building the math-emu code as a module only when
CONFIG_SMP is not set. The fp trap handler cannot be preempted
on a single-CPU (as CONFIG_PREEMPT is not going to be supported
on alpha), so the module can be safely unloaded at any time.

Avoid warnings about truncating them when building the
name database.

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

From: Chris Wedgwood <cw@f00f.org>

Seperate function, cruft removed and old_hwif
renamed to something less confusing.

From: Yoshinori Sato <ysato@users.sourceforge.jp>

With minor fixes from me

reiserfs_file_write unlocks the pages it operated on before updating
i_size.  This can lead to races with writepage, who checks i_size when
deciding how much of the file to zero out.

This patch also replaces SetPageReferenced with mark_page_accessed() in
reiserfs_file_write

This was verified to fix the BitKeeper data corruption problems that
Steven Cole has been debugging, where concurrent writes to a file and
writebacks to disk would cause zeroes in the file when CONFIG_PREEMPT
was enabled.

- clear hwif->hw in setup-pci.c before using it

- fix arch/arm/Kconfig to allow IDE only on platforms supporting it

- introduce IDE_ARCH_OBSOLETE_INIT and ide_default_io_ctl() so
  we can use generic ide_init_hwif_ports() and kill no longer needed
  <asm-arm/arch-*/ide.h> (leave broken lh7a40x and sa1100 versions)

Cross-compile tested on ARM.

Add drivers/ide/arm/ide_arm.c for simple default IDE interfaces
and clean obsolete ide_init_default_hwifs() implementations
in asm-arm/arch-{cl7500,rpc,shark}/ide.h and asm-arm26/ide.h.

This allows us to kill ide_init_default_hwifs() completely
in the next patch (because lh7a40x and sa1100 are broken).

Cross-compile tested on ARM.

* Convert all netdev->priv references to the fancy new netdev_priv().

* Reads/writes from/to eeprom using ethtool weren't working right
  on big-endian.  Now they are.

* Changed mapping on Rx skb to bi-directional.  skb->data holds both the
  RFD structure and the packet data, and the RFD is read/written by
  HW.  Issue found on Xscale HW that doesn't handle cache syncs auto-
  matically.  Other changes in patch are whitespace/spelling.

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

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

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

Bryan Rosenburg pointed out that the definition of PT_FPSCR in
include/asm-ppc64/ptrace.h is wrong.  The patch below fixes it.

From: Markus Lidel <Markus.Lidel@shadowconnect.com>

I have made a mistake in the kernel header i2o-dev.h.  All structures there
begin with the "iop" first, but in my structure the order is reversed.

From: NeilBrown <neilb@cse.unsw.edu.au>

If mddev->thread is non-null later, it gets used.

From: Anton Blanchard <anton@samba.org>

From: Olaf Hering

Provide pointer into the device-tree for vio devices.

From: Anton Blanchard <anton@samba.org>

IBM veth uses these symbols.

From: Anton Blanchard <anton@samba.org>

From: Olof Johansson

iommu_alloc_consistent should return NULL on failure.

From: Anton Blanchard <anton@samba.org>

Make PMC6 spin on POWER5 boxes.

From: Anton Blanchard <anton@samba.org>

- support newer 970 and POWER5 chips.

- use new SIHV/SIPR bits on POWER5.

- fix oops at shutdown.

From: Anton Blanchard <anton@samba.org>

From: Jake Moilanen

We want to make sure flash list is above 4 gigs, not 4 megs.

From: Anton Blanchard <anton@samba.org>

From: John Rose <johnrose@austin.ibm.com>

Please apply the following, which fixes a typo that prevents the creation of
the manage_flash /proc file.

From: Anton Blanchard <anton@samba.org>

This patch was submitted by Olaf Hering to fix mf_proc.c where it does not
return error values correctly.

From: Anton Blanchard <anton@samba.org>

I only got iseries first time around.  Add CONFIG_DEBUG_STACKOVERFLOW for
pseries/pmac too.

From: Anton Blanchard <anton@samba.org>

From: Nathan Lynch <nathanl@austin.ibm.com>

Somehow we've been placing the rtas error_log file at /proc/ppc64/error_log,
which breaks at least one application I know of.  It is supposed to be at
/proc/ppc64/rtas/error_log (this is the 2.4 behavior).

From: Anton Blanchard <anton@samba.org>

From: Jake Moilanen

Fix for not vmalloc'n space for the sequence number in rtas_log_buf.

From: Matt Porter <mporter@kernel.crashing.org>

Fixes 440GX UIC code, updates 440GX PVRs, and fixes a typo.

From: Matt Porter <mporter@kernel.crashing.org>

Fixes return value from ocp_register_driver().