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

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

The attached patch updates the acpi4asus driver to 0.27 through the
following changes:
- add support for M1300A, S5200N, L8400L,
- remove WLED support for certain models, since it is not controlled by
  AML,
- add LCD backlight switching for L2E / L3H,
- C99 initializers,
- generic LED handlers,
- the output of ASYM method to provide battery state information (might be
  more accurate under certain conditions) in /proc/acpi/asus/info,
- fix several oddities, various clean-ups and other minor changes.

The patch itself is quite big, which is mostly due to the C99 initializers
and the fact that diff doesn't like moving code around.

This has been compile-tested in various configurations, the substantive
changes were discussed on the acpi4asus mailing list.

The code should apply to current bk (both for 2.4 and 2.6). The patch is
also available here:
http://hell.org.pl/~sziwan/asus/acpi4asus-0.26-0.27.diff

Thanks to all the contributors (notably Pontus Fuchs) to this release.

Fix remote chance of invalid buffer access in write_video.
Support alternate HCI method path (recent "Phoenix BIOS" Toshiba's).
Signal more proc-write errors.
On proc-reads, report errors via printk instead of proc output.
Add log level and driver name prefix to all printk's.
Add missing __init and __exit function attributes.
Be explicit about vars for which code relies on zero-init of BSS.

from Martin Hicks

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

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

Somebody didn't build this on SMP

The usual linux/init.h missing include.

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

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

This fixes the "kernel_thread_helper" function so that it is in the
right segment (.text) regardless of any other code movement by the
compiler (eg "-funit-at-a-time").

From: Anton Blanchard <anton@samba.org>

sysrq helpers should have their active character capitalized

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

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.