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

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

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

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

Issue discovered by Ricky Beam (jfbeam@bluetronic.net).

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.