Mac/m68k NCR5380 SCSI updates (forward port of Ray Knight's changes in 2.4.x):
  - Forward port of pseudo-DMA from 2.2.20
  - Move SCSI host template definition from mac_scsi.h to mac_scsi.c

Generic RTC driver: fix spelling in documentation (from Geoffrey Lee
<glee@gnupilgrims.org>)

Q40/Q60 keyboard fixes:
  - IRQ definitions were prepended with Q40_
  - <asm/keyboard.h> no longer exists
  - Let q40kbd_init() fails if not running on a Q40/Q60
  - q40kbd_init() must return an error code
  - Make q40kbd_{init,exit}() static

Jeff removed the swap_device member from struct swap_info_struct
(http://www.uwsg.iu.edu/hypermail/linux/kernel/0202.1/0258.html)
but it is still used in the m68k arch for the ST-RAM. The below
should remove it.

Frankly, I didn't try compiling... My original intent was to move the
swap_list definition from swap.h to mm/swapfile.c, but m68k still
uses it here :( so perhaps this isn't possible. And I just happened to
stumble upon this.

(from Marcus Alanen <maalanen@ra.abo.fi> through Rusty Trivial Russell)

M68k generic RTC driver updates:
  - Revive help text for CONFIG_GEN_RTC
  - Re-add lost config option for CONFIG_GEN_RTC_X
  - Re-add lost mach_get_ss()
  - Export mach_[gs]et_rtc_pll()
  - Add implementation of mach_get_ss() and mach_[gs]et_rtc_pll() for Q40/Q60
  - Add missing include
  - Add implementation of get_rtc_ss()

Sun-3: Add missing deactivate_mm() (yes, there should be two of them in
include/asm-m68k/mmu_context.h: one for Motorola MMUs and one for Sun-3 MMUs)

M68k exception table updates to compensate for changes in 2.5.55

Q40/Q60 IRQ updates from 2.4.x

Amiga keyboard: the release bit indicates a key release, not a key press.

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

vm_enough_memory seems to call si_meminfo just to get the total
RAM, which seems far too expensive. This replaces the comment
saying "this is crap" with some code that's less crap.

Here is the s390x patch to use the new generic compatibility functions.

This creates compat_sys_sigpending and compat_sys_sigprocmask and
patches sent to maintainers remove all the arch specific versions.

With Martin's continuing approval, here is the s390x part of the patch.

This creates compat_sigset_t and compat_old_sigset_t i.e.  just the
types.  This is just the generic part, the architecture specific parts
will be sent to respective maintainers.

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

into samba.org:/scratch/anton/for-alan

into samba.org:/scratch/anton/for-alan

into samba.org:/scratch/anton/for-alan

into samba.org:/scratch/anton/for-alan

into samba.org:/scratch/anton/for-alan

into samba.org:/scratch/anton/for-alan

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

into kernel.bkbits.net:/home/davem/net-2.5

into kernel.bkbits.net:/home/davem/sparc-2.5

The current LOG_BUF size is a bit confusing the first
time that "make oldconfig" is used.  It's difficult to
select anything other than the default value.

Also, you (Linus) expressed a desire to have this
configurable only if DEBUG_KERNEL or "kernel hacking"
was enabled, so I've changed it to accomplish that.

This patch also uses Kconfig in a way that Roman intended
since a patch in 2.5.52 which enables default values if
a prompt is not enabled, but lets values be chosen when
the prompt is enabled.  You also asked for this in setting
this config option.

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

This provides for separate global and per-thread debug control
register value(s), which are switched as appropriate.  This allows
us to use both an external JTAG debugger for debugging the kernel
as well as using gdb to debug user programs.