into samba.org:/home/paulus/kernel/for-linus-ppc

into samba.org:/home/paulus/kernel/for-linus-ppc

Amiga Zorro bus updates
 - Bring APUS Zorro bus announcement in sync with the m68k version
 - Fix typo in Zorro device generator name
 - Kill duplicate ] in Zorro device ID database
 - Include <asm/io.h> instead of duplicating definitions from <asm/io.h>

console.wait_key was removed

M68k VT updates:
  - Include <linux/vt_kern.h> instead of copying the kd_mksound() prototype
  - Lots of stuff depends on CONFIG_VT:
      o SYSRQ_KEY
      o kd_mksound()
      o mach_keyb_init()
      o mach_kbdrate()
      o mach_kbd_leds()
      o mach_kbd_translate()
      o mach_sysrq_xlate()
      o Atari keyboard and joystick drivers
  - There's no need to provide dummy routines for kbd{rate,_leds}()
  - dummy_con depends on CONFIG_DUMMY_CONSOLE

MVME serial driver updates (from 2.4.x)
  - Add missing save of interrupt state
  - _tty_name() got renamed to tty_name()
  - Add devfs support
  - Simplify baud logic
  - Add missing MOD_DEC_USE_COUNT
  - Add missing cli()
  - block_til_ready() got renamed to gs_block_til_ready()

MVME SCSI updates
 - Fix return type in prototype of ncr53c7xx_init()

M68k fault handling updates
  - Fix incorrect page alignment
  - Merge related inline asm statements to avoid .chip confusion
  - Add Sun-3 bus mapping test code
  - Kill warning

M68k TLB updates

M68k task and thread updates

Add new syscalls to m68k
  - Add syscall entries for sys_pivot_root, extended attributes, and futex
  - Fix formatting

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