From David Miller.

Don't list icside.o in drivers/ide/pci/Makefile - it's in drivers/ide/arm.

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

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

After getting feedback from Tom,I made some changes to the patch
Attached is a revised version.

into kroah.com:/home/linux/BK/pci-2.6

into kernel.bkbits.net:/home/wesolows/sparc32-2.6

into foobazco.org:/sources/2.5-sparc-todave

This removes C_LABEL and asm/cprefix.h as well as NEW_GAS.  These were
used to support building on SunOS and with ancient binutils.

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

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

,write}{b,w,l,q}().

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

You know you want it. Give it to me.

This implements the initial support for the AGP gart in Transmeta's
Efficeon processors.

This code is based on linus' code from a while ago.  Peter and I adapted
it for the current kernel.

The note at the top indicates how it was tested, known issues, and so
forth.  It is working quite well, and we'll work to fix the minor issues
and test it some more with s3, more cards, other southbridges, etc.,
next.

Make IDE PCI drivers register /proc/ide/<chipset> entries themselves.

Additionally ide_end_drive_cmd() contains all functionality of this function.

When ide_remove_proc_entries() is called, driver specific /proc/ide/hdx/
entries have been already removed by ->cleanup()->ide_unregister_subdriver().

Remove "hdx=flash" (ignored since 2.5.63) and "hdx=slow"
(ignored since 2.5.41) kernel parameters.

Also remove "slow" entry from /proc/ide/hdx/settings
and "ata_flash", "nobios" and "slow" fields from ide_drive_t.

From: Andi Kleen <ak@suse.de>

This fixes some more problems introduced by the IA32e merge on x86-64

- Make it compile on UP again.
- Let the microcode driver build as a module

Remove an unneeded WSET() which snuck in there.

The sysrq-T output currently tries to display the mimimum amount of free
stack which each task has ever had available.  It has been busted for years,
because we forgot to zero out the stack when it is first created.

Fix that up, adding a conig option for it.

If the option is disabled, or the arch is not x86 then the free stack usage
will display as zero.

From: Herbert Poetzl <herbert@13thfloor.at>

sys_ptrace() for v850, if pid == 1, doesn't put the struct task_struct
(child), the following patch should fix that ...

From: Arjan van de Ven <arjanv@redhat.com>

fix obvious non-C-standard stubs on ppc64