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
pcxhr_core.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git	2008-07-14 15:51:11 -07:00
pcxhr_core.h
pcxhr_hwdep.c
pcxhr_hwdep.h
pcxhr_mixer.c
pcxhr_mixer.h
pcxhr.c
pcxhr.h