original_kernel/sound/drivers
Ingo Molnar 6e15cf0486 Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2
Conflicts:
	arch/parisc/kernel/irq.c
	arch/x86/include/asm/fixmap_64.h
	arch/x86/include/asm/setup.h
	kernel/irq/handle.c

Semantic merge:
        arch/x86/include/asm/fixmap.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-03-27 17:28:43 +01:00
..
mpu401 ALSA: Convert to snd_card_create() in other sound/* 2009-01-12 15:21:19 +01:00
opl3 ALSA: Add missing KERN_* prefix to printk in sound/drivers 2009-02-05 16:00:56 +01:00
opl4
pcsp Merge branch 'topic/misc' into for-linus 2009-03-24 00:35:50 +01:00
vx Merge branch 'topic/misc' into for-linus 2009-03-24 00:35:50 +01:00
Kconfig x86: allow more than 8 cpus to be used on 32-bit 2009-01-30 00:20:22 +01:00
Makefile
dummy.c ALSA: Convert to snd_card_create() in other sound/* 2009-01-12 15:21:19 +01:00
ml403-ac97cr.c ALSA: Convert to snd_card_create() in other sound/* 2009-01-12 15:21:19 +01:00
mtpav.c Merge branch 'topic/misc' into for-linus 2009-03-24 00:35:50 +01:00
mts64.c Merge branch 'topic/misc' into for-linus 2009-03-24 00:35:50 +01:00
pcm-indirect2.c
pcm-indirect2.h
portman2x4.c ALSA: Convert to snd_card_create() in other sound/* 2009-01-12 15:21:19 +01:00
serial-u16550.c Merge branch 'topic/misc' into for-linus 2009-03-24 00:35:50 +01:00
virmidi.c Merge branch 'topic/misc' into for-linus 2009-03-24 00:35:50 +01:00