original_kernel/sound
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
core Driver core: convert sound core to use struct device 2006-12-01 14:52:01 -08:00
drivers
i2c
isa
mips
oss [PATCH] severing poll.h -> mm.h 2006-12-04 02:00:36 -05:00
parisc
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
sparc
synth
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
Makefile
last.c
sound_core.c Driver core: convert sound core to use struct device 2006-12-01 14:52:01 -08:00
sound_firmware.c