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.

http://bugzilla.kernel.org/show_bug.cgi?id=1564

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

into nuts.davemloft.net:/disk1/BK/net-2.6

into nuts.davemloft.net:/disk1/BK/net-2.6

Fixes:
* Fix to htb_requeue routine.
* Debug mode related oops fixes.

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

into nuts.davemloft.net:/disk1/BK/sparc-2.6

From Jouni Malinen <jkmaline@cc.hut.fi>

Added Michael MIC keyed digest for TKIP (IEEE 802.11i/WPA). This algorithm
is quite weak due to the requirements for compatibility with old legacy
wireless LAN hardware that does not have much CPU power. Consequently, this
should not really be used with anything else than TKIP.

Michael MIC is calculated over the payload of the IEEE 802.11 header which
makes it easier to add TKIP support for old wireless LAN cards. An additional
authenticated data area is used (but not send separately) to authenticate
source and destination addresses.

From Jouni Malinen <jkmaline@cc.hut.fi>

Added support for using keyed digest with an optional dit_setkey handler.
This does not change the behavior of the existing digest algorithms, but
allows new ones to add setkey handler that can be used to initialize the
algorithm with a key or seed. setkey is to be called after init, but before
any of the update call(s).

Version 0.07 of softdog.c - Changes that were made are:
* Extract the start/keepalive code in a seperate function (softdog_keepalive)
* Extract the stop code in a seperate function (softdog_stop)
* Add notifier support
* Extract softdog_set_heartbeat code to seperate subroutine
* Small clean-up's

From Armin Schindler <armin@melware.de>:

  "These files were added in the first place for the compat
   driver to the legacy isdn4linux module. Since the Eicon
   driver now uses CAPI only, these files are obsolete."

Cleanup header file after changes to wdt.c and wdt_pci.c

Version 0.10 of wdt_pci.c - Changes that were made are:
* Extract the start code in a seperate function (wdtpci_start)
* Extract the stop code in a seperate function (wdtpci_stop)
* Convert wdtpci_ping so that it return an int value (0=succes).
* Extract the get_temperature code in a seperate function (wdtpci_get_temperature)
* Make /dev/watchdog and /dev/temperature to different misc devices with their own fops.
* Reorganize init and exit functions
* Make heartbeat (the emulated heartbeat) a module parameter
* Rewrite status flag code so that we could add a new tachometer module parameter
   + make clear distinction between PCI-WDT500 and PCI-WDT501.
* Small clean-up's