From: Muli Ben-Yehuda <mulix@mulix.org>

- switch lock_set_fmt() and unlock_set_fmt() from macros to inline
  functions.  Macros that call return() are EVIL.

- simplify lock_set_fmt() and implement it via test_and_set_bit() rather
  than a spinlock protecting an int.

- fix a bug wherein we would do an up() on a semaphore that hasn't been
  down()ed if a signal happened after timeout in trident_write().

- fix a bug where we would not release the open_sem on OOM.

- make the arguments for prog_dmabuf clearer (int -> enum), and add two
  wrapper functions around it, one for record and one for playback.  

- fix a bug where we would call VALIDATE_STATE after lock_kernel().  Since
  VALIDATE_STATE does 'return' if validation fails, bad things can happen. 
  Thanks to Dawson Engler <engler@stanford.edu> and the Stanford checker for
  spotting.

- remove the calls to lock_kernel() from trident_release() and
  trident_mmap().  trident_release() appears to be covered by the open_sem,
  and trident_mmap() is covered by state->sem.

- s/TRUE/1/, s/FALSE/0/

From: Muli Ben-Yehuda <mulix@mulix.org>

Reindent the trident OSS sound driver

From: Christoph Hellwig <hch@lst.de>

Now that modutils don't have built-in aliases anymore this is needed to
make mount -t vxfs autload the module.

From: Anton Blanchard <anton@samba.org>

From: Anton Blanchard <anton@samba.org>

Generate a global printk rate-limiting function, printk_ratelimit().

Also, use it in the page allocator warning code.  Also add a dump_stack to
that code.

Later, we need to switch net_ratelimit() over to use printk_ratelimit().

From: Geert Uytterhoeven <geert@linux-m68k.org>

Buddha/CatWeasel IDE: Make sure the core IDE driver doesn't try to request the
MMIO ports a second time, since this will fail.

From: Geert Uytterhoeven <geert@linux-m68k.org>

M68k Documentation: framebuffer.txt no longer exists in the m68k directory
(from Nikita Melnikov)

From: Geert Uytterhoeven <geert@linux-m68k.org>

Genrtc: Move code to kill warning if CONFIG_PROC_FS is disabled

From: Geert Uytterhoeven <geert@linux-m68k.org>

Cirrusfb: Replace `extern inline' by `static inline'

From: Geert Uytterhoeven <geert@linux-m68k.org>

M68k core: Replace (variants of) `extern inline' by `static inline'

From: Geert Uytterhoeven <geert@linux-m68k.org>

M68k: Fix (unused) definition of init_thread_info (from Roman Zippel)

From: Geert Uytterhoeven <geert@linux-m68k.org>

M68k: Don't forget to initialize the thread_info member in INIT_THREAD() (from
Roman Zippel)

From: Geert Uytterhoeven <geert@linux-m68k.org>

M68k has no VGA or MDA consoles

From: Geert Uytterhoeven <geert@linux-m68k.org>

Amiga core: Use C99 struct initializers

From: Geert Uytterhoeven <geert@linux-m68k.org>

M68k: Add missing #ifdef __KERNEL / #endif (from Christian T. Steigies)

From: Geert Uytterhoeven <geert@linux-m68k.org>

Mac II VIA: Don't include <asm/init.h> directly

From: Geert Uytterhoeven <geert@linux-m68k.org>

Amiga: Fix `debug=mem' (record all kernel messages in ChipRAM):
virt_to_phys() no longer works for Zorro II memory space, we must use
ZTWO_PADDR()

From: Geert Uytterhoeven <geert@linux-m68k.org>

Zorro bus: Add support for sysfs and the new driver model

From: Geert Uytterhoeven <geert@linux-m68k.org>

Amiga Gayle IDE: Add support for the IDE interface on the M-Tech E-Matrix 530
expansion card

From: Geert Uytterhoeven <geert@linux-m68k.org>

Amiga Gayle IDE: Kill old test code for the IDE doubler

From: Geert Uytterhoeven <geert@linux-m68k.org>

ADB: Disable the ADB clock code when CONFIG_ADB is not selected (from Matthias
Urlichs).

From: Geert Uytterhoeven <geert@linux-m68k.org>

Macfb: Update setup routine (from Matthias Urlichs)

From: Geert Uytterhoeven <geert@linux-m68k.org>

Mac ADB IOP: Fix improperly initialized request struct in the reset code,
causing a bogus pointer (from Matthias Urlichs)

From: Geert Uytterhoeven <geert@linux-m68k.org>

Sun-3 ID PROM: Use C99 struct initializers

From: Geert Uytterhoeven <geert@linux-m68k.org>

Q40 interrupts: Use C99 struct initializers

From: Geert Uytterhoeven <geert@linux-m68k.org>

MVME16x RTC: Use C99 struct initializers

From: Geert Uytterhoeven <geert@linux-m68k.org>

M68k math emulator: Use C99 struct initializers

From: Geert Uytterhoeven <geert@linux-m68k.org>

M68k: Export missing symbols (from Matthias Urlichs)

From: Geert Uytterhoeven <geert@linux-m68k.org>

BVME6000 RTC: Use C99 struct initializers

From: Geert Uytterhoeven <geert@linux-m68k.org>

Amiga sound: Use C99 struct initializers

From: Geert Uytterhoeven <geert@linux-m68k.org>

Atari Hades PCI: Use C99 struct initializers

From: Geert Uytterhoeven <geert@linux-m68k.org>

M68k: Avoid bus fault for certain RMW accesses (from Roman Zippel)

From: Geert Uytterhoeven <geert@linux-m68k.org>

M68k: Use a constant m68k_supervisor_cachemode only if we know it's safe,
otherwise use the value from head.S (from Roman Zippel)

From: Geert Uytterhoeven <geert@linux-m68k.org>

M68k: Remove trailing white space (from Roman Zippel)

From: Geert Uytterhoeven <geert@linux-m68k.org>

M68k: Make console functions position independent (from Roman Zippel)

From: Geert Uytterhoeven <geert@linux-m68k.org>

M68k: Update some comments (from Roman Zippel)

From: Geert Uytterhoeven <geert@linux-m68k.org>

M68k: Remove unused console_video_virtual (from Roman Zippel)

From: Geert Uytterhoeven <geert@linux-m68k.org>

M68k: Use function macros and local macro for console functions (from Roman
Zippel)

From: Geert Uytterhoeven <geert@linux-m68k.org>

Floppy: On m68k, PC-style floppies are used on Q40/Q60 and Sun-3x only. Sun-3x
floppy is currently broken (needs I/O abstractions)

From: "Art Haas" <ahaas@airmail.net>

Replace the GNU initializers with C99 initializers.