David Woodhouse 751851af7a Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git ...

Conflicts:

	sound/pci/Kconfig

2008-07-14 15:51:11 -07:00

..

Makefile

…

ymfpci_main.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

2008-07-14 15:51:11 -07:00

ymfpci.c

[ALSA] Remove sound/driver.h

2008-01-31 17:29:48 +01:00