into samba.org:/home/paulus/kernel/for-linus-ppc

	this patch must be applied after PnP patch v0.94. It contains my
small cleanups of PnP code and I tried to rewrite almost all ISA PnP
drivers to new PnP subsystem except sound drivers (ALSA & OSS).

  PnP update
    - separated dev->resource to dev->io_resource and dev->mem_resource
    - added pnp_*_valid() macros
    - added status member to pnp_card structure
    - added pnp_device_attach/detach functions
    - added pnpc_attach/detach functions
    - moved pnp_find_card() and pnp_find_dev() functions to isapnp.h
    - updated IDE/gameport/ISDN/network/scsi/radio/telephone drivers
      to latest PnP code

This patch makes the ne.c compile and ISA pnp ne2k work after
changes in 2.5.54 for PNP broke it.

 a. use pnp_dev instead of pci_dev
 b. convert to appropriate pnp_*()'s
 c. check -1 instead of 0 for invalid IRQ

This patch allows isapnp cards to be detected now.  Seems around 2.5.54,
a change in isapnp_build_device_list changed:

	card->protocol = &isapnp_protocol;
	 to
	card->protocol = &isapnp_card_protocol;

This patch adapts isapnp_init to the above change.

In 2.5.50 the level of isapnp_init was moved to after apci.  Since it is
now after net_dev_init, ISA PNP NICS fail to initialized at boot.

This fix allows ISA PNP NIC cards to work during net_dev_init, and still
leaves isapnp_init after apci_init.

This separates the "PPro/Celeron/Pentium-II" compile option into "PPro"
and "Pentium-II/Celeron" options.

This allows us to explicitly support the Pentium II and Celeron,
specifically adding the `-march' option for the chip and enabling the
unaligned copy optimizations.  PPro support remains unchanged.

This patch is by Luuk van der Duim with some changes by me (primarily to
also support the pre-Coppermine Celeron chips, since those use Pentium
II cores).  This patch has been in 2.5-mm for awhile and Andrew ack'ed
this submission.

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

Update sa1100_ir to use new dma-mapping subsystem.  Register a
system device for the SIR/FIR uart port, and a device driver for
this driver.

set_irq_type is redundant for many SA1111 drivers.  The active edge
is setup by the core SA1111 code for the common case.

SA1111 driver names are lower case.  Make the sa1111 ohci driver
reflect this.

Add sa1100_wdt watchdog support.

Remove the pci_dma functionality from the Acorn SCSI drivers, and
replace with the new DMA API, passing in the generic struct device.

Add 00-INDEX and booting documentation, remove obsolete DMA
documentation.

This adds knowledge of the relevant Intel errata

-	450NX rev B0 we must not do IDE DMA
-	450NX rev C0 we must ensure restreaming is off or risk corruption
-	ICH0-ICH2 have a data corrupting hardware bug in the old old MWDMA0
	mode, so we avoid MWDMA0 on such devices

Author:  Torben Mathiasen

Driver for Compaq Triflex IDE - older bus mastering IDE found on Compaq
WS5000 and similar systems.

Noted by Maciej Rozycki <macro@ds2.pg.gda.pl>.

Add empty statements to avoid warning.

This also avoids the nasty warnings that nobody seems to bother
to fix.

programs still depend on it and in fact do install a different signal
restorer than the standard kernel version.

At bootup, one_page_table_init() pulls the rug out from under the kernel
by installing a new page table before setting it up.  With big TLB's, it
can go unnoticed, but a 486 has a small TLB so any miss will cause a
triple fault and reset.

cpu-sa11x0: CPUFREQ_ALL_CPUS shouldn't be passed as argument to
cpufreq_notify_transition() any more, but the exact CPU number.

mach-integrator: cpufreq_notify_transition() isn't called -- which
means that the transition notifiers are not informed. This patch adds
these callbacks. Also, CPUFREQ_ALL_CPUS can't passed to
cpufreq_driver->set_policy any longer, so some code can safely be
removed.

(Adam Belay)            -use list_del instead of list_del_init in some areas
                        -introduce pnp capability and status flags
                        -remove static resource setting, I did some research and found that only
                         PnPBIOS supports it, therefore it is better to implememt this in the
                         PnPBIOS protocol itself. (it appears ACPI doesn't use this)
                        -Remove pnp_dev_has_driver and use PNP_ATTACHED instead, this is necessary
                         because a card driver only has rights over a device that it requests.
                        -added card_for_each_dev macro
                        -undo isapnp protocol changes, the pnp layer was designed to handle cards
                         and devices on the same protocol and I feel they should not be seperated.
(Pual Laufer)           -Fix remove driver bug in pnp card services
(Adam Richter)          -Fix a potential oops in id registration functions

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

into tp1.ruhr-uni-bochum.de:/scratch/kai/kernel/v2.5/linux-2.5.isdn

From: Adrian Bunk <bunk@fs.tum.de>

The patch below removes #if'd kernel 2.0 code from
drivers/isdn/divert/divert_init.c.

From: Christian Borntraeger <linux@borntraeger.net>
  
This patch makes isdn_tty HZ aware.
The first change changes 3000 jiffies (now 3 seconds) to 30 seconds according to
the comment.
I dont know, if the second change (schedule_timeout(50);) has to be half a
second but this was the value used in 2.4.

Instead of having "switch (subtype)" in just about every function,
rather use separate functions and invoke the right one using
the now existing struct card_ops infrastructure.

All IRQ handlers for IPAC based cards were basically the same (not
a big surprise, since the chip is the same), so we can share
the IRQ handler.

IPAC is basically a combined HSCX/ISAC chip, so we can generate
the D- and B-channel access functions knowing how to access the IPAC.
  
For performance reasons, this happens in a macro.

Just renaming and introducing some helpers makes them look very similar
to each other..

Except for a minor performance penalty, using the same IRQ handler
for cards which used the same code anyway seems perfectly natural...