alistair23-linux/sound/oss
Linus Torvalds 708e16892e Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
  Add missing maintainer countries in CREDITS
  Fix bytes <-> kilobytes  typo in Kconfig for ramdisk
  fix a typo in Documentation/pi-futex.txt
  BUG_ON conversion for fs/xfs/
  BUG_ON() conversion in fs/nfsd/
  BUG_ON conversion for fs/reiserfs
  BUG_ON cleanups in arch/i386
  BUG_ON cleanup in drivers/net/tokenring/
  BUG_ON cleanup for drivers/md/
  kerneldoc-typo in led-class.c
  debugfs: spelling fix
  rcutorture: Fix incorrect description of default for nreaders parameter
  parport: Remove space in function calls
  Michal Wronski: update contact info
  Spelling fix: "control" instead of "cotrol"
  reboot parameter in Documentation/kernel-parameters.txt
  Fix copy&waste bug in comment in scripts/kernel-doc
  remove duplicate "until" from kernel/workqueue.c
  ite_gpio fix tabbage
  fix file specification in comments
  ...

Fixed trivial path conflicts due to removed files:
   arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
2006-10-03 16:35:11 -07:00
..
cs4281 [PATCH] irq-flags: sound: Use the new IRQF_ constants 2006-07-02 13:58:54 -07:00
dmasound [POWERPC] sound: Constify & voidify get_property() 2006-07-31 15:55:06 +10:00
emu10k1 [PATCH] irq-flags: sound: Use the new IRQF_ constants 2006-07-02 13:58:54 -07:00
.gitignore kbuild: ignore all generated files for make allmodconfig (x86_64) 2006-02-26 20:15:58 +01:00
ac97.c
ac97.h
ac97_codec.c [PATCH] oss: semaphore to mutex conversion 2006-03-23 07:38:15 -08:00
ac97_plugin_ad1980.c
aci.c [PATCH] sem2mutex: sound/oss/ 2006-03-23 07:38:13 -08:00
aci.h
ad1816.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ad1848.c fix file specification in comments 2006-10-03 23:01:26 +02:00
ad1848.h
ad1848_mixer.h fix file specification in comments 2006-10-03 23:01:26 +02:00
ad1889.c [PATCH] irq-flags: sound: Use the new IRQF_ constants 2006-07-02 13:58:54 -07:00
ad1889.h [PARISC] OSS ad1889: Match register names with ALSA driver 2006-04-21 22:20:31 +00:00
adlib_card.c fix file specification in comments 2006-10-03 23:01:26 +02:00
aedsp16.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
ali5455.c [PATCH] irq-flags: sound: Use the new IRQF_ constants 2006-07-02 13:58:54 -07:00
au1000.c [PATCH] irq-flags: sound: Use the new IRQF_ constants 2006-07-02 13:58:54 -07:00
au1550_ac97.c [PATCH] Alchemy: Delete unused pt_regs * argument from au1xxx_dbdma_chan_alloc 2006-09-26 08:48:54 -07:00
audio.c fix file specification in comments 2006-10-03 23:01:26 +02:00
audio_syms.c
awe_hw.h fix file specification in comments 2006-10-03 23:01:26 +02:00
awe_wave.c fix file specification in comments 2006-10-03 23:01:26 +02:00
awe_wave.h fix file specification in comments 2006-10-03 23:01:26 +02:00
bin2hex.c
btaudio.c [PATCH] irq-flags: sound: Use the new IRQF_ constants 2006-07-02 13:58:54 -07:00
CHANGELOG
cmpci.c [PATCH] irq-flags: sound: Use the new IRQF_ constants 2006-07-02 13:58:54 -07:00
coproc.h
cs46xx.c [PATCH] cs46xx OSS: switch to pci_get_device 2006-10-01 00:39:20 -07:00
cs46xx_wrapper-24.h
cs46xxpm.h
cs461x.h
cs461x_image.h
cs4232.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
dev_table.c fix file specification in comments 2006-10-03 23:01:26 +02:00
dev_table.h
dm.h
dmabuf.c fix file specification in comments 2006-10-03 23:01:26 +02:00
es1370.c [PATCH] irq-flags: sound: Use the new IRQF_ constants 2006-07-02 13:58:54 -07:00
es1371.c [PATCH] irq-flags: sound: Use the new IRQF_ constants 2006-07-02 13:58:54 -07:00
esssolo1.c [PATCH] irq-flags: sound: Use the new IRQF_ constants 2006-07-02 13:58:54 -07:00
forte.c [PATCH] irq-flags: sound: Use the new IRQF_ constants 2006-07-02 13:58:54 -07:00
gus.h
gus_card.c fix file specification in comments 2006-10-03 23:01:26 +02:00
gus_hw.h
gus_linearvol.h
gus_midi.c fix file specification in comments 2006-10-03 23:01:26 +02:00
gus_vol.c
gus_wave.c fix file specification in comments 2006-10-03 23:01:26 +02:00
hal2.c [PATCH] irq-flags: sound: Use the new IRQF_ constants 2006-07-02 13:58:54 -07:00
hal2.h
harmony.c fix file specification in comments 2006-10-03 23:01:26 +02:00
hex2hex.c
i810_audio.c [PATCH] irq-flags: sound: Use the new IRQF_ constants 2006-07-02 13:58:54 -07:00
ics2101.c fix file specification in comments 2006-10-03 23:01:26 +02:00
iwmem.h fix file specification in comments 2006-10-03 23:01:26 +02:00
kahlua.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
Kconfig Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-10-03 16:35:11 -07:00
mad16.c
maestro.c [PATCH] irq-flags: sound: Use the new IRQF_ constants 2006-07-02 13:58:54 -07:00
maestro.h
maestro3.c [PATCH] irq-flags: sound: Use the new IRQF_ constants 2006-07-02 13:58:54 -07:00
maestro3.h
Makefile [MIPS] Remove IT8172-based platforms, ITE 8172G and Globespan IVR support. 2006-10-03 17:59:17 +01:00
maui.c fix file specification in comments 2006-10-03 23:01:26 +02:00
midi_ctrl.h
midi_syms.c
midi_synth.c fix file specification in comments 2006-10-03 23:01:26 +02:00
midi_synth.h
midibuf.c fix file specification in comments 2006-10-03 23:01:26 +02:00
mpu401.c fix file specification in comments 2006-10-03 23:01:26 +02:00
mpu401.h
msnd.c [PATCH] msnd section fix 2006-06-25 10:01:04 -07:00
msnd.h
msnd_classic.c
msnd_classic.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
msnd_pinnacle.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
msnd_pinnacle.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
nec_vrc5477.c [PATCH] irq-flags: sound: Use the new IRQF_ constants 2006-07-02 13:58:54 -07:00
nm256.h
nm256_audio.c [PATCH] irq-flags: sound: Use the new IRQF_ constants 2006-07-02 13:58:54 -07:00
nm256_coeff.h
opl3.c fix file specification in comments 2006-10-03 23:01:26 +02:00
opl3.h
opl3_hw.h
opl3sa.c fix file specification in comments 2006-10-03 23:01:26 +02:00
opl3sa2.c fix file specification in comments 2006-10-03 23:01:26 +02:00
os.h
pas2.h
pas2_card.c fix file specification in comments 2006-10-03 23:01:26 +02:00
pas2_midi.c fix file specification in comments 2006-10-03 23:01:26 +02:00
pas2_mixer.c fix file specification in comments 2006-10-03 23:01:26 +02:00
pas2_pcm.c
pss.c fix file specification in comments 2006-10-03 23:01:26 +02:00
README.FIRST
rme96xx.c [PATCH] irq-flags: sound: Use the new IRQF_ constants 2006-07-02 13:58:54 -07:00
rme96xx.h
sb.h
sb_audio.c fix file specification in comments 2006-10-03 23:01:26 +02:00
sb_card.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
sb_card.h
sb_common.c fix file specification in comments 2006-10-03 23:01:26 +02:00
sb_ess.c spelling fixes 2006-06-26 18:35:02 +02:00
sb_ess.h
sb_midi.c fix file specification in comments 2006-10-03 23:01:26 +02:00
sb_mixer.c fix file specification in comments 2006-10-03 23:01:26 +02:00
sb_mixer.h fix file specification in comments 2006-10-03 23:01:26 +02:00
sequencer.c fix file specification in comments 2006-10-03 23:01:26 +02:00
sequencer_syms.c
sgalaxy.c fix file specification in comments 2006-10-03 23:01:26 +02:00
sh_dac_audio.c sound: SH DAC audio driver updates. 2006-09-27 13:48:32 +09:00
sonicvibes.c [PATCH] irq-flags: sound: Use the new IRQF_ constants 2006-07-02 13:58:54 -07:00
sound_calls.h
sound_config.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
sound_firmware.h
sound_syms.c
sound_timer.c fix file specification in comments 2006-10-03 23:01:26 +02:00
soundcard.c fix file specification in comments 2006-10-03 23:01:26 +02:00
soundvers.h
sscape.c fix file specification in comments 2006-10-03 23:01:26 +02:00
swarm_cs4297a.c [PATCH] proper flags type of spin_lock_irqsave() 2006-10-01 00:39:21 -07:00
sys_timer.c fix file specification in comments 2006-10-03 23:01:26 +02:00
trident.c [PATCH] pr_debug: trident: use size_t length modifier in pr_debug format arguments 2006-10-03 08:04:19 -07:00
trident.h
trix.c fix file specification in comments 2006-10-03 23:01:26 +02:00
tuning.h
uart401.c fix file specification in comments 2006-10-03 23:01:26 +02:00
uart6850.c fix file specification in comments 2006-10-03 23:01:26 +02:00
ulaw.h
v_midi.c fix file specification in comments 2006-10-03 23:01:26 +02:00
v_midi.h
via82cxxx_audio.c [PATCH] via82cxxx_audio: Use pci_get_device 2006-10-01 00:39:20 -07:00
vidc.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
vidc.h
vidc_fill.S
vwsnd.c [PATCH] Fix compilation for sound/oss/vwsnd.c 2006-03-26 08:56:58 -08:00
waveartist.c fix file specification in comments 2006-10-03 23:01:26 +02:00
waveartist.h fix file specification in comments 2006-10-03 23:01:26 +02:00
wavfront.c [PATCH] irq-flags: sound: Use the new IRQF_ constants 2006-07-02 13:58:54 -07:00
wf_midi.c fix file specification in comments 2006-10-03 23:01:26 +02:00
ymfpci.c [PATCH] irq-flags: sound: Use the new IRQF_ constants 2006-07-02 13:58:54 -07:00
ymfpci.h [PATCH] sem2mutex: sound/oss/ 2006-03-23 07:38:13 -08:00
ymfpci_image.h
yss225.c
yss225.h

The modular sound driver patches were funded by Red Hat Software 
(www.redhat.com). The sound driver here is thus a modified version of 
Hannu's code. Please bear that in mind when considering the appropriate
forums for bug reporting. 

Alan Cox