This is a temporary fix, pending fuller TGA updates.

From: Christian Vogel:

    drivers/video/tgafb.c is missing a include, complaining about
    color_table[] and others not being defined.

From: Armin Schindler <armin@melware.de>

just a small patch to fix a typo.

From: Petr Baudis <pasky@ucw.cz>

This patch fixes a bug which I hit when migrating from 2.4.  Basically,
when I do setfont during the system boot, the then-spawned ttys do not
retain the new font but fall back to the default one.

I've tracked that down to a clearly bogus test in fbcon_set_display(),
because vc->vc_font.width is not set at that time yet (no font has been
loaded for the new vc).  But even if it would (or this was meant to test
against tmp->vc_font.width), it would mean only *HUGE* fonts would be
retained.  And even if there were *two* bugs there and it was supposed to
be less-than there, I couldn't make a sense of the test.

From: Alan Stern <stern@rowland.harvard.edu>

A change which was recently applied to fs/proc/proc_misc.c included a comment
about splitting a seq_printf into two pieces to work around a bug in
gcc-2.95.3.  Unfortunately gcc-2.96 still chokes on the statements.  The
patch below makes it work better and tidies the code up a bit.

From: Paul Mundt <lethal@linux-sh.org>

This is the rest of the sh update, which includes everything else
sh-specific, general cleanups, bugfixes, etc.  Nothing really eventful.

From: Paul Mundt <lethal@linux-sh.org>

This includes sh-specific framebuffer updates, including updates to hitfb and
pvr2fb, as well as adding sh to the pgprot_writecombine() users in fb_mmap().

From: Paul Mundt <lethal@linux-sh.org>

This implements hugetlb support for SH-4.  SH-4 supports 1k/4k/64k/1MB pages,
since we're only interested in the 64k/1MB sizes, this is what we support.

The sh hugetlbpage code borrows heavily off of the sparc64 port, which works
fine for these cases at this point in time.

From: Paul Mundt <lethal@linux-sh.org>

This implements the DMA mapping API for sh, as well as cleaning up some
sh-specific DMA drivers.

From: Paul Mundt <lethal@linux-sh.org>

SuperH DAC OSS driver.

From: Paul Mundt <lethal@linux-sh.org>

This ports the sh-sci driver to the new API.  sh and h8 both use this.  The
intention is to leave the drivers/char sh-sci in place for a short period of
time until all the h8 people are on the new driver (sh no longer uses the
drivers/char version).

From: Paul Mundt <lethal@linux-sh.org>

This patch updates the sh defconfigs to use the board_defconfig format
instead of the defconfig-board format that sh was using before.  Since Sam
Ravnborg already added the automated archhelp stuff that sh was using to the
top-level Makefile, the sh version can be killed off.

From: Stephen Rothwell <sfr@canb.auug.org.au>

This patch starts cleaing up (and paring down) the virtual console driver. 
It does:

- viocons is NOT a serial driver

- remove unneeded empty methods

- change the console name

From: Stephen Rothwell <sfr@canb.auug.org.au>

This patch stops an oops caused by certain ioctls being performed on the
virtual cdrom.  In particular, the eject and tray close operations were
affected.

From: Paul Mackerras <paulus@samba.org>
      Olaf Hering <olh@suse.de>

This adds __kcrctab to the discard list for the link script for the boot
wrapper, and is needed if you compile with CONFIG_MODVERSIONS.

With this patch applied, we need to update makefile dependencies.  Otherwise
the bootfiles will remain untouched because they do not depend on the changed
linker script.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

  add missing copyin

into intel.com:/home/lenb/src/linux-acpi-test-2.6.5

http://bugzilla.kernel.org/show_bug.cgi?id=1622
add "acpi_sci=edge" and "acpi_sci=high" manual over-ride

(And more sane. Turn off ECN by default, add
netfilter, and make sure we always support msdos
partitions for external drives).

The recent conversion of the open-of-a-nonexistent-blockdev return value from
ENXO to ENODEV was wrong.  We should have converted the chardev code to
return -ENXIO too.

From: Anton Blanchard <anton@samba.org>

Implement pci_dma_error.  Create PCI_DMA_ERROR_CODE like sparc64, it will
allow us to find and fix out of tree drivers using NO_TCE directly.

ibmveth needs some surgery, fix it temporarily until the guys come up with
a decent fix.

From: Anton Blanchard <anton@samba.org>

Clean up early boot messages.

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>

This patch fix a problem with semaphore usage on wakeup from sleep in
pmac_zilog (crashing some laptops on wakeup).

From: Anton Blanchard <anton@samba.org>

Implement iommu=off for pseries.  We limit memory to 2GB as pmac does,
however the default for < 2GB remains iommu=on unlike pmac.

From: Anton Blanchard <anton@samba.org>

- Consolidate printing of timebase and cpuinfo in /proc/cpuinfo, there were
  many trivial differences between pseries/iseries/pmac.

- Remove ppc_md.setup_residual, no longer needed

- Fix for processors over 2.147GHz, from Jake Moilanen.  We were using a
  signed int to parse the OF property.

- Set some sane defaults for timebase and processor frequency if we fail to
  get the correct values from OF.

From: Anton Blanchard <anton@samba.org>

While scanning for the last few users of udbg, I found this. Its old
code that we dont use, so remove it.

From: Anton Blanchard <anton@samba.org>

From: Santiago Leon <santil@us.ibm.com>

Fix log_rtas_error bug where the results from the call that resulted in an
error where lost due the attempt to log the error.

From: Anton Blanchard <anton@samba.org>

The ppc64 hotplug code must register and deregister devices with the extended
error handling (EEH) subsystem.

From: Anton Blanchard <anton@samba.org>

Linus just added it to the generic compat layer, we can remove this
(commented out) version.

This patch cleans up and makes more consistent the messages produced by
some of the iSeries virtual device drivers.  It also make them less
verbose.

controller is always in XLATE mode.

That's not true on at least some ppc64 boxes, and we
shouldn't break those just because apparently some
IBM PS/2 model 70 has something strange here.

Cset exclude: vojtech@suse.cz|ChangeSet|20040303141401|00802

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Update Kconfig info to reflect the changes in wdt.c and wdt_pci.c

   Function divacapi_remove_cards() is now used for __init as well,
   so it may not be marked __exit.

   Removed own implementations for linked-list handling, use
   Linus kernel API of list.h instead.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Version 1.14 of pcwd.c - Changes that were made are:
* Extract the start code in a seperate function (pcwd_start)
* Extract the stop code in a seperate function (pcwd_stop)
* Extract the get_temperature code in a seperate function (pcwd_get_temperature)
* Make /dev/watchdog and /dev/temperature to different misc devices with their own fops
* Small clean-up's

Tested on pcwd card with temperature option.