All of the cleanup functions in sound/oss/emu10k1/main.c were incorrectly
marked as __devinit. This little one fixes it, so that the module no longer
oopses when being removed.

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

From Alexander Atanasov <alex@ssi.bg>

Fix DMA I/O and state machine fixes, error recovery

Since the IO-APIC irq disable fix went in we can now enable
the proper IRQ disabling in the IDE driver again. That had
been disabled due to the problems with UP IO-APIC.

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

on 2.5+, since ppc64 can (and does) use the PCI domain numbers
for this instead.

The PCI domain support should be back-ported to 2.4.x rather
than having bigger PCI bus numbers.

Cset exclude: jgarzik@pobox.com|ChangeSet|20030714162217|61624

This fixes a build problem on sparc, and hopefully will prevent this from
happening in the future...

into kroah.com:/home/greg/linux/BK/pci-2.5

into groveronline.com:/root/bk/linux-acpi

This patch includes quite a few changes and updates for the shwdt driver (which
brings it in sync with LinuxSH CVS HEAD). This fixes up support for the SH-2,
and also fixes up some timer brain-damage.

This patch updates the sh-specific hd64465 pcmcia driver for the new API, as
well as fixing up some other issues (such as remap_page_range() abuse -- we
remap through P3 area instead) which caused it not to compile. Changes by
Dominik Brodowski and myself.

Here's an update for pvr2fb (with a patch this time), which makes it compile
again.

ppc64 machines can have PCI bus numbers larger than 8 bits, but it looks
like pci_device_to_OF_node already handles this case, in both 2.4 and
2.5.

We just need the space to store them.

This solves the unresolved symbol problem with modular intermezzo.  Also
update the MAINTAINERS entry.

send_IPI_self is needed to resend irqs with IRQ_PENDING status when
enabled.

Checked with Ingo, and it's in 2.4-ac for some time.

This should fix ide lost interrupts on UP with IO-APIC

Ide trigers it this way:
 - disable_irq
 - do stuff that triggers IRQ.
 - irq is IRQ_PENDING
 - enable_irq
 - IRQ is lost, needs to be resend.

I'll send the patch to fixup IDE disable_irq logic to Bart.

From Flavio B. Leitner. <fbl@netbank.com.br>

Fix a memory leak and an unchecked return code in the busmouse driver.

From Daniele Bellucci <bellucda@tiscali.it>.

Check the copy_to_user() return code in read_profile().

From Jorn Engel <joern@wohnheim.fh-wedel.de> and Randy Dunlap.

It reduces stack usage in the WAN router by about 0x500 bytes
(from 0x520 to 0x24 when I did it in April).

This fixes this warning:

  syncppp.c:165: warning: function declaration isn't a prototype

by adding "void" as the function parameter list.

This fixes one place where I missed the replacing dcache_lock with
vfsmount_lock in put_namespace().

Tested with CLONE_NEWNS flag also.

the last patch forgot to fix the debug code.

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

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

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

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.

into minion.yyz.somanetworks.com:/ws/scottm/linux-2.5-cpci-fixes

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

Nate Lawson)

Removed double kfree in unconfigure_visit_pci_dev_phase2, and
added a call to pci_bus_add_devices in cpci_configure_slot.

Changed CONFIG_HOTPLUG_PCI_CPCI to a bool instead of a
tristate to match how it is used in the makefiles.  The
board specific driver options have hadd their "depends on"
lines updated to have HOTPLUG_PCI first so that they will
work as expected.