original_kernel/sound/oss/dmasound
Jiri Kosina d014d04386 Merge branch 'for-next' into for-linus
Conflicts:

	kernel/irq/chip.c
2009-12-07 18:36:35 +01:00
..
Kconfig
Makefile
dmasound.h
dmasound_atari.c
dmasound_core.c
dmasound_paula.c
dmasound_q40.c