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
..
aoa	Merge branch 'topic/aoa' into for-linus	2009-03-24 00:35:51 +01:00
arm	Merge branch 'topic/drop-l3' into for-linus	2009-03-24 00:36:05 +01:00
atmel	ALSA: Add ALSA driver for Atmel AC97 controller	2009-02-05 15:08:51 +01:00
core	Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6	2009-03-26 16:14:02 -07:00
drivers	Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2	2009-03-27 17:28:43 +01:00
i2c	ALSA: drop outdated and broken sa11xx-uda1341 driver	2009-03-17 17:58:13 +01:00
isa	Merge branch 'topic/sscape-fix' into for-linus	2009-03-24 00:36:21 +01:00
mips	Merge branch 'topic/misc' into for-linus	2009-03-24 00:35:50 +01:00
oss	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k	2009-03-26 16:15:31 -07:00
parisc	ALSA: Convert to snd_card_create() in other sound/*	2009-01-12 15:21:19 +01:00
pci	Merge branch 'topic/pcxhr' into for-linus	2009-03-24 00:36:19 +01:00
pcmcia	Merge branch 'topic/misc' into for-linus	2009-03-24 00:35:50 +01:00
ppc	Merge branch 'topic/powermac' into for-linus	2009-03-24 00:36:20 +01:00
sh	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2009-03-26 11:11:23 -07:00
soc	Merge branch 'topic/snd_card_new-err' into for-linus	2009-03-24 00:35:35 +01:00
sparc	Merge branch 'topic/misc' into for-linus	2009-03-24 00:35:50 +01:00
spi	ALSA: Convert to snd_card_create() in other sound/*	2009-01-12 15:21:19 +01:00
synth	Merge branch 'topic/misc' into for-linus	2009-03-24 00:35:50 +01:00
usb	Merge branch 'topic/usb-caiaq' into for-linus	2009-03-24 00:36:23 +01:00
ac97_bus.c	ALSA: ac97 - Include ac97_codec.h for ac97_bus_type declaration	2008-12-02 16:25:37 +01:00
Kconfig	ALSA: Add Atmel ALSA drivers directory	2009-02-05 15:08:53 +01:00
last.c	[ALSA] Remove sound/driver.h	2008-01-31 17:29:48 +01:00
Makefile	ALSA: Add Atmel ALSA drivers directory	2009-02-05 15:08:53 +01:00
sound_core.c	ALSA: Fix declaration of sound_class	2008-12-15 16:55:27 +01:00
sound_firmware.c	Detach sched.h from mm.h	2007-05-21 09:18:19 -07:00