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)

M68k ISA: Fix ISA memory space mapping for Amiga PCMCIA (from Kars de Jong)

M68k: Export missing symbols:
  - mach_beep (for m68k beeper)
  - strpbrk (for SCSI)

dvd_read_physical() uses a 20 char buffer to read in the dvd structure,
however the size is really 4 bytes header + 17 bytes body so layer->bca
ends up containing garbage. Kudos to the nice folks who made it a non
multiple of 4 bytes.

Lots of patches from Norbert Kiesel that fix up several silly
 | vs. || and & vs. && bugs found with
	find ${1:-.} -name \*.c | xargs grep -En \
	 '![a-zA-Z0-9_ ]+(\|[^|]|\&[^&])|([^|]\||[^&]\&) *!'

From Petr Vandrovec

   we use nbd for our diskless systems, and it looks to me like that
it has some serious problems in 2.5.x... Can you apply this patch
and forward it to Linus?

There were:
* Missing disk's queue initialization
* Driver should use list_del_init: put_request now verifies
  that req->queuelist is empty, and list_del was incompatible
  with this.
* I converted nbd_end_request back to end_that_request_{first,last}
  as I saw no reason why driver should do it itself... and
  blk_put_request has no place under queue_lock, so apparently when
  semantic changed nobody went through drivers...

Originally by Rusty Lynch, munged by me, acked
by Mochel.

 Attempting to cat a sysfs file that returns an error will result in an
 endless dump of garbage to the screen because the result of the specific
 show operation was being saved to a size_t (unsigned) and then later
 checked for a negative value.

From Pavel Machek

From: Jon Foster <jon@jon-foster.co.uk>

This patch against 2.5.63 adds kerneldoc comments to the public API in these files:
- include/asm-i386/uaccess.h
- arch/i386/lib/usercopy.c

This patch only changes comments and one of the templates used by "make htmldocs",
it does not change any code.

Fix by Randy Dunlap

Here's a patch to build ide/pci/piix.c with CONFIG_PROC_FS=n.

Old patch from John Kim to remove old DRM 4.0 code in 2.5.59.

From Herbert Xu

The following patches against 2.4 and 2.5 makes cciss unregister properly
if initialisation fails.

into home.transmeta.com:/home/torvalds/v2.5/linux

into home.transmeta.com:/home/torvalds/v2.5/linux

  - created snd-page-alloc module
    - moved all page allocation code there
    - preserves preallocated DMA buffers for devices
  - USB audio driver updated
  - AC'97 - better modem initialization code
  - timer API - enhanced (added pause and more event notifications)
  - splitted ice1724 code from ice1712 to own module
  - general
    - timerstamp cleanups (timeval -> timespec)
    - C99-like cleanups
  - trident driver
    - more workaround for wrong IRQ acks
  - OSS sequencer emulation
    - fixed OOPS (wrong free order)
    - more compatible with level 1 of sequencer (/dev/sequencer)
  - CS46xx driver updated
  - intel8x0 driver updated
  - emu10k1 driver updated

into home.transmeta.com:/home/torvalds/v2.5/linux

into home.transmeta.com:/home/torvalds/v2.5/linux

From: Angus Sawyer <angus.sawyer@dsl.pipex.com>

Prevent OOPS on removing floppy driver with "rmmod -f floppy".

floppy.c would attempt to unregister resources for nonexistent device.

Patch stops the driver attempting to register and unregister the nonexistent
device by removing the drive from the allowed drives mask (defaults to
present).