into home.osdl.org:/home/torvalds/v2.5/linux

Also consolidate a bunch of convoluted if's into a single
"is this an r200 or r300" function.

The recent escd fix I have made corrects a thinko in the PnPBIOS code and it
turns out that faults from calling /proc/pnp/bus/escd were probably not caused
by BIOS bugs.

into home.osdl.org:/home/torvalds/v2.5/linux

Sometimes a menuconfig item is shown twice, so hide the other item.

Let gconf find it's glade file, even it's started with an absolute path
and check srcdir so it also works if it's compiled outside of the tree.

gconf compile warning fixes (by Buddy Lucas <b.lucas@ohra.nl>)

fix gconf segfault problem (by Romain Lievin <roms@tilp.info>)

generate an error if writing of kernel config failed

Fix for oops on rmmod caused by *_remove() function marked as __devinit
(and thus discarded after module initialization - if CONFIG_MODULES=y
and CONFIG_HOTPLUG is not set).
This patch changes __devinit to __devexit and adds __devexit_p() where
pointer to such function is used.

The only exception is au1000, where au1000_remove() is called from
cleanup_au1000() function - __devinit is jest removed there.

It was also removed in 2.4.23.

Use rq->cmd[0] instead of rq->flags for storing special request flags.

Per Jens' suggestion.  Tested by Stef van der Made <svdmade@planet.nl>.

Revert wrong changes introduced in 2.4.21.

From: Stefan Talpalaru <stefantalpalaru@yahoo.com>,
      Ingo Kilian <ikilian@web.de>.

The MSI port to x86-64 added an interrupt routing bug that makes the
kernel not boot anymore on some machines.

Fix that.

From Pavel Machek

sometimes nanoseconds are used, sometimes microseconds, sometimes even something else.

Dominik Brodowski.

From Dominik Brodowski

into home.osdl.org:/home/torvalds/v2.5/linux

into home.osdl.org:/home/torvalds/v2.5/linux

On ARM, it is possible to configure the desired cache policy in
the page tables.  Unfortunately, we haven't been updating the
protection_map nor PAGE_KERNEL, so this option doesn't change
the behaviour of the majority of mappings.  This cset corrects
this oversight.

into home.osdl.org:/home/torvalds/v2.5/linux

Patch from: Amit Gurdasani

I have a PROLiNK 1456VH internal Rockwell-based ISA PnP K56flex fax modem
whose EISA ID seems not to be known to 8250_pnp.c. The ID is AEI0250 as
reported in /sys/devices/pnp1/01:01/01:01.00/id and adding this into the
pnp_dev_table[] allows the device to be found and enabled properly by the
8250 serial driver.

From Daniel Tram Lux: under extreme irq load on an underpowered CPU,
the timeout loop may not make any progress, and decide that a timeout
occurred before it has actually tested the status register.

The minimal fix for now is to just have a final test _after_ the timeout
to remove the problem. The real fix would likely be to not have irqs
enabled between reading the status and the timeout. 

The resource handling left in autoconfig() is plainly wrong, since
we've already claimed the necessary resources prior to calling
autoconfig().  Therefore, we remove the superfluous code from
autoconfig().