Sun-3/3x frame buffer device updates
  - Fix breakage from recent fbdev changes
  - Add support for CG3 graphics on Sun-3/3x

Atari STRAM fixes
  - Add missing include
  - Fix parameter passing to atari_stram_reserve_pages()

Spelling fix

SCSI scatterlist updates for m68k
  - Fix printk() format
  - Update for page/offset in scatterlist

Q40/Q60 keyboard updates
  - Ignore illegal scancodes
  - Remove unused q40kbd_leds()
  - Fix return type and return value of q40kbd_init_hw()

Remove CPU information from /proc/hardware (already in /proc/cpuinfo)

Add PCI_DMA_BUS_IS_PHYS for m68k

M68k parport updates
 - Remove workaround code for parport bug (parport without FIFO)
 - ->dma_buf is used in FIFO mode only
 - Add missing prototype for parport_atari_init()
 - Initialize uninitialized variable

Mac/m68k Nubus updates
  - Use nubus_{read,write}[bwl]()
  - Fix /proc/bus/nubus
  - Fix type and linkage of nubus_init()
  - Use nubus_{read,write}[bwl]()
  - Kill some address assignment warnings
  - Include <asm/nubus.h>
  - nubus_init() is an initcall, hence static

Add definition for PROT_SEM on m68k

M68k core mm updates
  - Update fault handling
  - Remove superfluous flush_tlb_page()
  - Remove obsolete comment
  - empty_zero_page becomes a void *
  - Type and cast clean ups
  - Remove duplicated test for voff == 0
  - Move check_pgt_cache() to pgtable.h
  - Pte and pmd updates
  - Add additional parameter to {clear,copy}_user_page()
  - pfn updates
  - BUG() updates
  - Move check_pgt_cache() from motorola_pgalloc.h
  - Misc updates
  - Add __page_address() and page_to_phys()

Add Mac/m68k support to valkyriefb

Mac/m68k doesn't use the PowerMac NVRAM driver

Mac m68k Ethernet driver updates (from 2.4.x)
 - mace68k_probe() got renamed to mace_probe()
 - Add missing MODULE_LICENSE()
 - Add missing register definition for SONIC_DCR2

Misc Mac/m68k updates
 - Make sure we have one instance of mac_hw_present
 - Kill warning
 - Rename struct SCC to struct mac_SCC to avoid type conflict

Update ISA space code on m68k (from 2.4.x)
 - Add support for multiple types of ISA busses in one kernel image (e.g. an
   image for both Q40 and Amiga with PCMCIA)
 - Allow port operations on m68k if CONFIG_ISA is defined

M68k I/O core updates
 - Use memory mapped I/O access routines for non-ISA/PCI/PCMCIA m68k devices
 - Don't use writel() and friends on m68k memory mapped I/O
 - Fix typo in definition of writew()
 - Add missing definitions for {in,out}_le{16,32}()

The old form of designated initializers are obsolete: we need to replace them
with the ISO C forms before 2.6.  Gcc has always supported both forms anyway.

(from Rusty Russell <rusty@rustcorp.com.au>, with some mods by me)

M68k USER_HZ updates

HP300 LANCE driver updates
  - Update DIO probe code
  - Use out_8() instead of writeb() for non-PCI memory mapped I/O
  - Kill warnings

Merge remaining bits of core HP300 support

Fix Mac build if no fonts are selected

Add Sun-3x floppy support (from 2.4.x)

The Mac6x11 font depends on CONFIG_FBCON_MAC, not on CONFIG_MAC

The penguin logo resides in normal RAM, not in frame buffer memory, so we must
not use fb_readb()

M68k DMA address type update: Add definition for dma64_addr_t on m68k

HP300 DIO bus updates

 - Atari joystick device number updates
 - Atari ACSI hard disk driver device updates
 - Atari floppy driver device updates
 - MVME147 serial driver dev_t update

Linux/m68k configuration updates
  - Unify serial console questions
  - Move serial driver config questions together
  - The Atari mouse driver depends on the Atari keyboard driver, hence on
    CONFIG_VT
  - Don't hardcode CONFIG_VT=n on VME, you may want it for a multi-machine
    kernel
  - The IRQ_* definitions are not used on Amiga, but we need them if we
    build a multi-machine kernel, too

Fix miscellaneous compilation warnings and errors

Enable Q40 keyboard and serial, and Apollo keyboard

M68k cache handling updates
  - Add missing definition of L1_CACHE_SHIFT
  - Define L1_CACHE_BYTES in terms of L1_CACHE_SHIFT
  - Add missing include
  - Fix address types and casts

M68k bitops updates
  - use bitmap_member() for bitops data declaration
  - Make the m68k bitops really operate on unsigned long
  - Add fls()

Atari frame buffer device updates
  - Move static function definition before usage
  - Fix breakage caused by recent fbdev changes
  - Make some setup parameter parsing separate routines (strsep() must be able
    to modify the passed pointers)
  - On Atari the ATI Mach64 registers are memory mapped, but it's not on
    the PCI bus, so we cannot use writel() and friends.
  - Kill warnings by protecting unused data with the appropriate #ifdef
  - On Atari the ATI Mach64 registers are memory mapped, but it's not on the
    PCI bus, so we cannot use writel() and friends.
  - Fix assignment of addresses for Atari

Fix breakage introduced by seq_printf() changes

Fix Apollo frame buffer device breakage after the recent fbdev changes

Port Apollo mouse driver to the `new' busmouse API

 Amiga native graphics updates
  - Fix typo
  - Make monitor capability parsing a separate routine (strsep() must be able
    to modify the passed pointer)

 The Cirrus Logic frame buffer device needs access to the memory mapped VGA I/O space on Amiga

 Add video mode initialization code to the CyberVision64/3D driver

 Add S3 ViRGE register definitions for the CyberVision64/3D driver

Mac/m68k ADB updates (from 2.4.x)
 - Add support for m68k Macs
 - Add missing call to VIA CUDA initialization routine
 - Update Mac II VIA support
 - Make local functions static and add their prototypes
 - Add missing defines for Mac/m68k PMUs

Update MVME i82596 Ethernet driver (from 2.4.x)
  - Add support for BVME6000
  - Add KERN_* prefixes to printk() calls
  - Wait for config change requests