David Howells 4796b71fbb Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: drivers/pcmcia/ds.c Fix up merge failures with Linus's head and fix new compile failures. Signed-Off-By: David Howells <dhowells@redhat.com>		2006-12-06 15:01:18 +00:00
..
aoa	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-12-05 14:37:56 +00:00
arm	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
core	Driver core: convert sound core to use struct device	2006-12-01 14:52:01 -08:00
drivers	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
i2c	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
isa	[ALSA] Fix dependency of snd-adlib driver in Kconfig	2006-10-22 10:51:10 +02:00
mips	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
oss	[PATCH] severing poll.h -> mm.h	2006-12-04 02:00:36 -05:00
parisc	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
pci	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-12-05 14:37:56 +00:00
pcmcia	[PATCH] pcmcia: conf.ConfigBase and conf.Present consolidation	2006-12-04 20:12:02 -05:00
ppc	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
sparc	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
synth	[ALSA] Fix disconnection of proc interface	2006-09-23 10:36:48 +02:00
usb	usb: usbmixer free kill urb cleanup	2006-12-01 14:23:35 -08:00
Kconfig	Fix misc Kconfig typos	2006-11-30 05:22:59 +01: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	Driver core: convert sound core to use struct device	2006-12-01 14:52:01 -08:00
sound_firmware.c	[PATCH] build sound/sound_firmware.c only for OSS	2006-09-29 09:18:24 -07:00