skb->cb even on 64-bit systems. 

Removed the redundant 'asoc' field in struct sctp_ulpevent and
instead use sinfo_assoc_id which is present within the other field
'sndrcvinfo'. This makes the size of struct sctp_ulpevent to be less
than the size of skb->cb[](48 bytes) even on 64-bit systems.

into us.ibm.com:/home/sridhar/BK/lksctp-2.5.75

First "test" kernel. Same naming we used for 2.4.0 - there it took
from May to December to get to the real version. Let's see if we
can do it faster this time.

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

Switching the PCMCIA interrupts from serial PCI interrupts to parallel
PCI interrupts causes machines to hang solid.  If we leave such setups
well alone, and only change the interrupt mode of parallel PCI systems
between PCI+ISA and PCI only.

From Matthew Wilcox <willy@debian.org>.

into kanga.twiddle.net:/home/rth/work/linux/axp-2.5

The accounting works now, but I still think this last bit should be
added as well.  This makes absolutely sure we only account fs requests,
at both ends. Better safe than sorry.

The recent change from Andi breaks here: tmp.name is user pointer, not
array in __sysctl_args, and so it is better to access it through
copy_from_user instead of directly.

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

Didn't turn up anything particularly nasty, but it does clean up
usage of a few types that are passed around.
- Do the casts in the ioctl handler instead.
- Remove unused variables.
- __user annotations.

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

into tetrachloride.(none):/mnt/raid/src/kernel/2.5/agpgart

Again, untested in AGP3.x mode.

into tetrachloride.(none):/mnt/raid/src/kernel/2.5/agpgart

This (and a few other SiS chipsets) are AGP 3 compliant. AFAIK, none of
these have been tested in AGP3 mode, but they should work just fine in
AGP2.x mode at least.

into nuts.ninka.net:/home/davem/src/BK/net-2.5

into nuts.ninka.net:/home/davem/src/BK/sparc-2.5

From David Mosberger

This GART isn't actually a PCI device, which the AGP core/DRI expects it to be.
This patch gets the relevant info out of ACPI tables, and fakes the rest.

from 2.4-ac - it seems to cause hangs for people.