linux/sound
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
..
aoa [ALSA] aoa: add locking to tas codec 2006-09-23 10:47:06 +02:00
arm [PATCH] irq-flags: sound: Use the new IRQF_ constants 2006-07-02 13:58:54 -07:00
core [PATCH] namespaces: utsname: use init_utsname when appropriate 2006-10-02 07:57:21 -07:00
drivers [PATCH] NULL noise removal 2006-09-24 15:55:03 -07:00
i2c [ALSA] ak4xxx - Remove bogus IPGA controls 2006-09-23 10:46:55 +02:00
isa [ALSA] gus: Use SEEK_{SET,CUR,END} instead of hardcoded values 2006-09-23 10:47:52 +02:00
mips [PATCH] sound/mips/au1x00: Use ARRAY_SIZE macro 2006-09-29 09:18:14 -07:00
oss Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-10-03 16:35:11 -07:00
parisc [ALSA] Remove xxx_t typedefs: PARISC Harmony 2006-01-03 12:20:09 +01:00
pci [PATCH] kmemdup: some users 2006-10-01 00:39:19 -07:00
pcmcia [ALSA] Add missing dB scale information to vxpocket driver 2006-09-23 10:45:03 +02:00
ppc [ALSA] powermac - Fix Oops when conflicting with aoa driver 2006-09-23 10:47:15 +02:00
sparc [PATCH] sound/sparc/dbri: Use ARRAY_SIZE macro 2006-09-29 09:18:14 -07:00
synth [ALSA] Fix disconnection of proc interface 2006-09-23 10:36:48 +02:00
usb [PATCH] kmemdup: some users 2006-10-01 00:39:19 -07:00
Kconfig [ALSA] snd-aoa: add snd-aoa 2006-06-22 21:34:38 +02:00
last.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Makefile [PATCH] build sound/sound_firmware.c only for OSS 2006-09-29 09:18:24 -07:00
sound_core.c [PATCH] build sound/sound_firmware.c only for OSS 2006-09-29 09:18:24 -07:00
sound_firmware.c [PATCH] build sound/sound_firmware.c only for OSS 2006-09-29 09:18:24 -07:00