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

an offset where needed.

1/ set new MD_RECOVERY_INTR flag instead of old 'err = -EINTR'
   when a resync thread is signaled - get rid of 'err' altogether in
   md_do_sync
2/ raid1 determines if resync is needed based on recovery_cp
   rather than mddev->in_sync (which now has a very different meaning)
3/ Don't update superblock when switching to writable mode.  The
   first write will update the superblock instead.

Amiga floppy driver: Convert {del,add}_timer() sequences to mod_timer().

Amiga frame buffer device: Port to the new fbdev API

Fix return type (must be int, not void) of *_console_init() after introduction
of console_initcall() in 2.5.x.

M68k timekeeping: Do not update the RTC every 11 minutes, since this confuses
NTP (the actual code has been commented out since a while).

Affs: Make sure the sizeof() is always correct (from Roman Zippel)

M68k core spelling fixes from Steven Cole <elenstev@mesatop.com>

Sun-3 NCR5380 SCSI: Re-add accidentally deleted KERN_DEBUG tags.

Wd33c93 SCSI: Fix 2.5.64 merge error

Amiga RTC updates from Kars de Jong <jongk@linux-m68k.org>:
  - Implement mach_get_ss() on Amiga
  - Use OKI recommendations for locking the A2000 clock
  - Streamline clock structure declarations

Amiga frame buffer device: request the correct interrupt, so we no longer get
spurious interrupts. The old code worked only by accident.

To avoid flicker when updating the display parameters, we do not use the real
vertical blank interrupt, but instead ask the Copper to generate an interrupt
after the bitplane and sprite pointers have been set up at the beginning of
each frame.

Amiga NCR53c7xx SCSI: Use z_ioremap() to map Zorro space

Sun-3 NCR5380 SCSI: Kill warning.

Sun-3: Properly calculate the physical address of the first virtual page
(0x0e000000) (from Sam Creasey)

Sun-3 memory zones: Mark all pages in zone 0, rather than splitting memory
evenly between zones (from Sam Creasey)

Sun-3 linkfile: Fix vmlinux-sun3.lds to make it compile (this version also
loads properly through the 11/24/2001 bootloader) (from Sam Creasey)

M68k SCSI drivers: update for the changes in 2.5.60:
  o Replace `->lun'    by `->device->lun'
  o Replace `->target' by `->device->id'
  o Replace `->host'   by `->device->host'

Genrtc: Sync generic RTC driver with 2.4.x.

Convert Amiga serial driver to use tasklets (from Roman Zippel)

M68k NCR5380 SCSI updates for changes in SCSI and NCR5380 SCSI layers:
  - Sun-3/3x (from Sam Creasey)
  - Atari (ported updates from Sun-3)
  - Mac (ported updates from Sun-3)

M68k SCSI drivers: Kill warnings caused by implicit conversions from volatile *
and remove some unneeded casts

M68k net drivers: Kill warnings caused by implicit conversions from volatile *

Wd33c93 SCSI: Export wd33c93_proc_info (needed for Amiga A3000, A2091, and GVP
II SCSI, and for MVME147 SCSI).

ide_ack_intr is defined in asm-*/ide.h, if IDE_ARCH_ACK_INTR is set.

M68k: Fix for changes to struct page -- access list member of structure
correctly (and allocate page tables sanely as a result) (from Sam Creasey)

M68k: Kill warnings generated by gcc-3.2:
  - Add missing <linux/string.h> include
  - Move unused static data inside usage area
  - Kill deprecated multi-line string literals
  - Add semicolons to empty cases in switch() constructs
  - Comment out unused labels
  - Fix extra tokens at end of #endif directives
  - a3000_release() may not be optimized away
  - Kill uninitialized variable warning

M68k Apollo I/O updates for MMIO and pseudo-MMIO (ISA I/O after translation):
  - Use out_8() and out_be16() instead of outb() and outw()
  - Remove conflicting definitions of {in,out}[bw]()

ADB: Fix spelling of sigprocmask

Q40: Replace sti() by local_irq_enable() in comment

M68k: Make PAGE_SIZE unsigned long to kill more warnings (cfr. other
architectures), except for asm, since gas cannot cope with the UL.

M68k: Heartbeat is also available on Apollo and Mac

M68k: Update for signal changes in 2.5.60 (from Roman Zippel).

M68k syscalls: NR_syscalls updates for 2.5.63

M68k: Remove .global for local labels that are used to subtract (needed for
recent binutils, from Andreas Schwab)

Amiga PCMCIA Ethernet: Use le16_to_cpus() instead of hardcoded byteswap (from
Kars de Jong)

M68k: Add new kmap types for 2.5.60.

M68k: Update POSIX timers in struct siginfo (cfr. asm-generic/siginfo.h in
2.5.63)