into nuts.ninka.net:/home/davem/src/BK/sparc-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

(dynamic power management)

into samba.org:/home/paulus/kernel/for-linus-ppc

into home.transmeta.com:/home/torvalds/v2.5/linux

into samba.org:/home/paulus/kernel/for-linus-ppc

into samba.org:/home/paulus/kernel/for-linus-ppc

For some strange reason I still have netlink device emulation enabled
in the kernel at home. This revealed one more missing 'int i' in Al's
devfs cleanup.

into home.transmeta.com:/home/torvalds/v2.5/linux

into mulgrave.(none):/home/jejb/BK/scsi-for-linus-2.5

This updates drivers/macintosh/adbhid.c driver (which interfaces between
the ADB bus and the input layer).  The patch gets rid of global cli/sti
uses and corrects some typos (for example input.idversion ->
input.id.version).  These changes have been approved by Franz Sirl, the
maintainer of this driver.

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

into conectiva.com.br:/home/BK/misc-2.5

Add error recovery for sclp failures. Fix endless loop in sclp_process_evbufs.

Major rewrite of lcs driver

Like the ctc driver, this one is using the cu3088 driver to get its
channels.

Authors:
	Frank Pavlic <pavlic@de.ibm.com>
	Martin Schwidefsky <schwidefsky@de.ibm.com>

ctc crapectomy

- fix lots of bitrot
- port to cu3088 driver

Authors:
	Cornelia Huck <cohuck@de.ibm.com>
	Arnd Bergmann <arndb@de.ibm.com>

Add driver for multi-subchannel devices (ctc and lcs)

The cu3088 driver is an metadriver to make the ctc and lcs
(potentially also claw) drivers work with the new
channel subsystem driver. It uses the ccwgroup driver to
group subchannels for ctc and lcs.

Authors:
	Arnd Bergmann <arndb@de.ibm.com>
	Cornelia Huck <cohuck@de.ibm.com>

Rework of tape driver

  Almost complete rewrite of the s390 tape driver code by
  Martin Schwidefsky. Skipping the 2.4 era, this makes the tape
  code ready for the future.

  This driver probably doesn't have to change much before 2.6.

Authors:
	Martin Schwidefsky <schwidefsky@de.ibm.com>
	Stefan Bader <shbader@de.ibm.com>

Convert dasd driver to new channel subsystem driver

This makes the dasd driver work again after the changes to
the channel subsystem driver:
- handle device detection with standard driver model functions
- reduce use of dasd_devmap (devmap will die as soon as
  dasd configuration is handled from initramfs)
- some cleanups

Authors: Arnd Bergmann <arndb@de.ibm.com>
	 Martin Schwidefsky <schwidefsky@de.ibm.com>

Update iucv driver for new driver model

iucv device configuration is now done through sysfs instead of /proc

Author: Cornelia Huck <cohuck@de.ibm.com>

Convert 3215 console driver to new channel subsystem driver

this adds support for the driver model to the 3215 driver. The console
is one of the biggest problems because the regular device detection
is now done at initcall time although we actually want full
support for channel attached console devices as early as possible.
con3215_init() now uses a special ccw_device_probe_console() function
to do an early initialization of a single device.

The main backdraw for users is that the console can no longer
be autodetected when not running under VM. LPAR or P390 users
with a channel attached console now have to specify
console_device=f00 as a kernel parameter.

Authors:
	Martin Schwidefsky <schwidefsky@de.ibm.com>
	Arnd Bergmann <arndb@de.ibm.com>

Documentation changes for common i/o.

ccwgroup bus driver.

The ccwgroup driver contains 'ccw_group' devices, which needed because of
strange hardware properties: Some device drivers need two or more
ccw_devices to make up a logical device and the user has to configure
which ones belong together. We have not found a way to represent this
correctly using the linux driver model, the current implementation
is about as good as it gets.

Authors: Arnd Bergmann <arndb@de.ibm.com>,

Rewrite of the s390 channel subsystem driver for the new driver model

The channel subsystem driver a.k.a s390 common I/O layer is the low level
driver for most device drivers on s390 systems. The old code is largely
unchanged from the initial linux-2.2 port and there is a lot of bitrot
on it.

In particular, concepts from the 2.5 driver model are implemented in a
completely different and more complicated way here.
This rewrite tries to get the driver ready for 2.6. The new interface is
not compatible to the old one but should be rather stable now unless
someone finds major flaws.

The 's390dyn' and 'chandev' interfaces have been removed entirely (yippii!)
and are replaced by hotplug and sysfs interfaces.

Authors: Arnd Bergmann <arndb@de.ibm.com>,
         Cornelia Huck <cohuck@de.ibm.com>,
         Martin Schwidefsky <schwidefsky@de.ibm.com>

Remove channel device layer.

s390 debugging documentation update.

Add missing include.