I had another look at the ugly rivafb memory ordering requirements.

It seems P{V,C}IO areas are only accessed using VGA_{RD,WR}8 macros. 
NV_{RW,WR}08 are never actually used directly.  So this patch makes at
least usage consistent: VGA_{RD,WR}8 to access "I/O areas" in an ordered
way.  NV_* for the rest.
Signed-off-by: Guido Guenther <agx@sigxcpu.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

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

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

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

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

Bingo...  edd_devices[] was too short.  When we keep more than 6
signatures, it overruns the end.  Also, I rewrote edd_num_devices to be
clearer about its goal. 

This patch is necessary even after the last edd.S patch was reverted.

Thanks to Christian Kujau for testing and narrowing it down enough to
debug this. 

It still doesn't explain why Christian's BIOS reports more devices than
he has, that's still up in the air, so don't re-apply the edd.S patch
just reverted. 
Signed-off-by: Matt Domsch <Matt_Domsch@dell.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Remove static flash device location definitions since they're now
obsolete.  Additionally, dynamically allocate driver private data
structures.

Use partitioning information passed in via the platform device
instead.  This means that individual machine files in
arch/arm/mach-sa1100 can contain their partitioning information.

- combine sa1100_locate_partitions with sa1100_mtd_probe.
- set device driver data in the probe method, and use this to get
  at our driver private information in the other methods.

This prepares the SA1100 flash driver to accept platform data via
the driver model.

This removes a bunch of SA1100 machine support files which have been
unable to be built for a while, due to missing out on updates.

Warning of removal had been posted to the ARM kernel mailing list,
and this cset represents those which did not attract any interest.

This adds platform_device-based partition and map information for
badge4, cerf, collie, h3600, hackkit and shannon SA1100 machine
types.

Patch from Ben Dooks

S3C2410/S3C2440 RTC driver using arch/arm/common/rtctime.c as
a base. Supports alarm, and periodic IRQ from 1 to 64Hz

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Dave Jiang

Remove nolonger used file from arch/arm/mach-iop3xx/mm-321.c

Signed-off-by: Dave Jiang
Signed-off-by: Russell King

into kroah.com:/home/greg/linux/BK/pci-2.6

into kroah.com:/home/greg/linux/BK/usb-2.6

This all because of stupid hardware implementations that can't decide
which endian form they want to run the chip in...
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

As pci_find_device is going away I've replaced it with pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>

As pci_find_device is going away I've replaced it with pci_get_device
and pci_dev_put.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

As pci_find_device is going away I've replaced it with pci_get_device
and pci_dev_put.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

As pci_find_device is going away I've replaced it with pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

As pci_find_device is going away I've replaced it with pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

As pci_find_device is going away I've replaced it with pci_get_device
and pci_dev_put.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

As pci_find_device is going away I've replaced it with pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

As pci_find_device is going away I've replaced it with pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

As pci_find_device is going away I've replaced it with pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

As pci_find_device is going away I've replaced it with pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

As pci_find_device is going away soon I have converted this file to use
pci_get_device instead. for_each_pci_dev is a macro wrapper around
pci_get_device.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>