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

Make ->ide_dma_begin() functions void and rename them to ->dma_start().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

* split off ->dma_exec_cmd() from ->ide_dma_[read,write] functions
* choose command to execute by ->dma_exec_cmd() in higher layers
  and remove ->ide_dma_[read,write]
* in Etrax ide.c driver REQ_DRIVE_TASKFILE requests weren't
  handled properly for drive->addressing == 0
* in trm290.c read and write commands were interchanged
* in sgiioc4.c commands weren't sent to disk devices
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

* tag REQ_DRIVE_TASKFILE write requests with REQ_RW
* split off ->dma_setup() from ->ide_dma_[read,write] functions
* use ->dma_setup() directly in ATAPI drivers and remove media
  checks from ->ide_dma_[read,write]
* ->ide_dma_[read,write,begin] cannot fail now
* in Etrax ide.c setup DMA for ATAPI devices before sending
  command to drive (so setup order is the same as for disks)
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

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

This provides a number of helper functions and data structures
for RTC implementations to make use of, including a standard
implemention for /proc/driver/rtc and the rtc miscdevice.  It
supports runtime registration of RTC timekeeping sources.

Footbridge was suffering from a little lack of care and attention;
it still had the nasty arch.c file with all the associated #ifdef
gross-ness that entailed.

Re-jig footbridge support so that each machine type contains all
the necessary support code, with a separate common implementation
which they all share.

Patch from Ben Dooks

Timer suspend code fails to check for NULL before
calling the timer implementor's suspend or resume hooks.

Signed-off-by: Ben Dooks 

into flint.arm.linux.org.uk:/usr/src/bk/linux-2.6-rmk

Move machine specific boot variables out of arch/arm/boot/Makefile
into arch/arm/mach-*/Makefile.boot.

In the near future, VFP will want to save state onto the user stack.
Therefore, separate out the iwmmxt specific parts, and implement
a generic "safe copy to user space using random CPU instructions".
This is necessary because iwmmxt and VFP both use special CPU
instructions to load and/or save their state.

This allows us to eliminate a multiplication when we have a constant
delay value, as per x86.

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

Some serial drivers receive their serial port device information via
the device model.  This unfortunately means that the selected port
may not be available when the console subsystem initialises, so we
must keep trying to register the console after each port is added.

This allows 8250 PCI ports to register with their correct device
structures.

serial8250_register_port()/serial8250_unregister_port() has the
capability of registering ports with their struct device nodes,
which allows sysfs to indicate which tty devices belong to which
hardware devices.

We also add a serial8250 platform device driver in an initial
attempt at PM for ISA ports.  However, I'm leaving out the
platform device for the time being since adding that would cause
potential oops issues.

Convert port autoprobing to set up->capabilities as it discovers
various capabilities of the port.  Warn when the detected
capabilities do not match those in the uart_config table.

It's pointless accessing the LSR value via a pointer all the time -
it prevents the compiler optimising it.  Also, ensure that we
recognise a break sent during a kernel printk correctly.

Add a bit of explaination why we only turn off the transmitter if
we are called from uart_stop().

Add UART_CAP_AFE, and use this to enable TI16C750 flow control,
but only if we have 32 bytes or more of FIFO.

This allows us to adapt the FCR for each port type in a much more
flexible way, and allows us to set the transmit trigger levels.

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

There was a mistake in the list of IDs I got from VIA,
which meant this chipset was incorrectly recognised.
Signed-off-by: Dave Jones <davej@redhat.com>

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

into pobox.com:/spare/repo/libata-2.6

into pobox.com:/spare/repo/libata-2.6

into pobox.com:/spare/repo/libata-2.6

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

merging viro's ETH* patches.

into pobox.com:/spare/repo/net-drivers-2.6

into pobox.com:/spare/repo/net-drivers-2.6