From: Anton Blanchard <anton@samba.org>

Also add cpu_relax() to several spinloops in xmon which wait for other cpus.

From: Anton Blanchard <anton@samba.org>

Slowly removing non essential things from the paca

From: anton@samba.org

use smp_processor_id everywhere

From: anton@samba.org

In some cases we can merge reserved regions with the next node.  There was a
bug in the way we calculated the overlapping region which caused us to fail
during boot.

From: anton@samba.org

use drivers/Kconfig

From: anton@samba.org

Fix pcibios_scan_all_fns on iSeries, from Jake Moilanen

From: anton@samba.org

Added definition of viomajortype_scsi so drivers/scsi/iSeries_vscsi will
compile

From: anton@samba.org

From: Hollis Blanchard <hollisb@us.ibm.com>

integrate vio.c with 2.6 driver model

From: anton@samba.org

Fixes for OF device tree update code, from Nathan Lynch

From: anton@samba.org

Fix compiler warnings, from Olof Johansson

From: anton@samba.org

change HSC -> HVSC

From: anton@samba.org

Fix up iseries updatepp, from Ben Herrenschmidt

From: anton@samba.org

fix up hvc console dev/devfs name, from Milton Miller

From: anton@samba.org

From: Hollis Blanchard <hollisb@us.ibm.com>

move hypervisor console code into its own file

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

into redhat.com:/spare/repo/net-drivers-2.5

TCQ code is host independent so remove redundant ide_dma_queued_* ops from
ide_hwif_t.  If we ever decide to bring back TCQ support this will fix OOPS
in ide-disk driver with CONFIG_BLK_DEV_IDE_TCQ_DEFAULT=y and icside/sgiioc4
host drivers (it will also enable TCQ support for these host drivers).

Acked by Jens.

First introduced in kernel 2.3.99-pre3 (added to ide_dmaproc) and never used.

Introduced in kernel 2.5.63 and never used.

Introduced in kernel 2.5.35 and never used.

Fix CONFIG_HPT34X_AUTODMA to depend directly on CONFIG_EXPERIMENTAL
and finally remove CONFIG_IDEDMA_PCI_WIP.

Leftover after switch to IDE DMA Model-Firmware blacklist in kernel 2.5.63.

Some devices need more time to become non-busy after command completion,
so use the same timeout in wait_drive_not_busy() (called from task_in_intr()
if CONFIG_IDE_TASKFILE_IO=y) as in drive_cmd_intr().

Thanks to Mark Haverkamp <markh@osdl.org> for help in fixing this.

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

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

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

	* don't take the unnecessary ->host_lock around ->scsi_done() call.

	* switched to proper parport_driver.

	* switched to use ->hostdata to get ppa_struct from Scsi_Host, end
of messing with ppa_hosts[]

	* fixed missing wakeups in ppa_pb_claim()/ppa_wakeup() - if the
former had been called just as current holder of port was giving it up,
we could set "I'm waiting" flag too late.  Cleaned up the timeout logics.

	* starting to kill ppa_detect - we move the "probe a single port"
logics into a separate function and shift scanning into ppa_driver_init().
Later that will give us a parport_driver ->attach().

	* killed include of scsi_module.h and switched from scsi_register()
to scsi_alloc_host().  We still keep the old detect logics at that point,
it will be gone later.

	* killed ppa_pb_claim() call in ppa_init()

	* switched ppa to passing around references to ppa_struct instead
of host numbers.

	* ppa.c fed through Lindent, functions unused elsewhere (by now -
	  all of them) made static.

	* switched to proper parport_driver.

	* switched to use ->hostdata to get imm_struct from Scsi_Host, end
of messing with imm_hosts[]

	* fixed missing wakeups in imm_pb_claim()/imm_wakeup() - if the
former had been called just as current holder of port was giving it up,
we could set "I'm waiting" flag too late.  Cleaned up the timeout logics.

	* starting to kill imm_detect - we move the "probe a single port"
logics into a separate function and shift scanning into imm_driver_init().
Later that will give us a parport_driver ->attach().

	* killed include of scsi_module.h and switched from scsi_register()
to scsi_alloc_host().  We still keep the old detect logics at that point,
it will be gone later.