into samba.org:/scratch/anton/tmp3

The current IDE Power Management code I wrote has a race on wakeup when
the master device got resumed, it may take a request.  At this point, a
PM resume request to a slave device of the same hwgroup would clear
hwgroup->rq and cause an Oops when the master device request completes. 

This patch fixes it.  Due to the context in which PM resume requests are
sent, just not clearing hwgroup->rq for these is enough. 

I also removed a useless debug message in the PM code that was
actually misleading (people though it indicated a problem while it
didn't, it's really useless) and fix a typo in a comment.

This fixes a bug that happens when a request gets to the IDE layer for a
drive using ide-default (that is with no subdriver attached), like a
Power Management request.  In this case, the core will wait for the
device status to match drive->read_stat, but that field contains by
default a value that is not suitable for ATAPI devices.  This patch
fixes it.

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

This allows us to maintain quirks or capabilities on a per-port basis,
so we can handle buggy clones more effectively.

The dependencies for CONFIG_SERIAL_CORE / CONFIG_SERIAL_CORE_CONSOLE
were becoming very messy.  This cset converts the dependencies to
use "select" statements instead.

Since the driver model has transitioned away from using multi-level
device suspend/resume, we also drop the multi-level support from
the serial layer.

Update the 8250 and sa1100 drivers for this change.

Here's a patch to update the RxRPC driver. Most of it is CodingStyle fixes,
but it also includes a few miscellaneous bug fixes. stdint types are also
turned into C99 forms (eg: u32 -> uint32_t).

Benh saw some bugs where the queue would end up being in an invalid
state, and this could certainly explain one of them. We must not have a
stopped queue on the plug list, and blk_plug_device() right now will
happily plug a stopped queue.

We don't need to have it plugged either, blk_start_queue() will make
sure that request_fn gets run.

Code that includes seq_file.h uses a magic pointer "(void*)1"
to start a header seq_printf.

This patch adds a #define, so that people can start writing more
readable code.

This should fix the "ifconfig down ...  ifconfig up" problems some
people have seen.

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

Don't use C++ "argument declarations anywhere" in the kernel, even if
newer versions of gcc accept it.

into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5

For some reason, we had a structure field called 'current'.  This patch
fixes that.

Fix a couple of sn2 files.

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

Update the SA11x0 serial driver for the removal of system devices
from the driver model.  The driver becomes a platform device driver.
The driver is now known to the driver model and resource subsytems
as "sa11x0-uart".

	away static variables with no compiler-visible use.

This patch eliminates two unused SN2 header files:
include/asm-ia64/sn/klclock.h and include/asm-ia64/sn/ioc3.h.

From: Oleg Drokin <green@namesys.com>

Without this, if elv_try_last_merge() returns nonzero, we do not
initialise *req.  That results in a subsequent BUG_ON() in
__make_request() because req is NULL (or is just uninitialised).

Last round of changes broke sdla build if not a module.