into samba.org:/scratch/anton/sfr

into samba.org:/scratch/anton/sfr

into samba.org:/scratch/anton/for-alan

into samba.org:/scratch/anton/for-alan

into samba.org:/scratch/anton/for-alan

into samba.org:/scratch/anton/for-alan

into samba.org:/scratch/anton/for-alan

into samba.org:/scratch/anton/for-alan

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

__virt_to_bus/__bus_to_virt depended on INTEGRATOR_HDR0_SDRAM_BASE
Unfortunately, this is defined in arch-integrator/platform.h, and
we really don't want to include it in memory.h.

We instead use BUS_OFFSET, which will eventually depend on the CPU
number in the system.

Only default BLK_DEV_IDEDMA on BLK_DEV_IDEDMA_ICS if ARCH_ACORN is
set, not if ARM is set.  There are PCI ARM systems out there!

Ensure that we clean up properly after initialisation error,
releasing all claimed resources in an orderly manner and
returning the correct error code.

Add cfbfillrect / cfbcopyarea / cfbimgblt objects for SA1100fb.
Remove redundant "pm" member.

Found a buglet in the marvel code -- doesn't change the number of IRQS
just the logic to get there.. This applies on top of the other marvel
code.

/jeff

into kanga.twiddle.net:/home/rth/linux/axp-2.5

to header files where they belong.

into samba.org:/scratch/anton/for-alan

of AGP and SRMCONS patches.

From Jeff.Wiedemeier@hp.com.