Merge branch 'topic/pcxhr' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 23 Mar 2009 23:36:19 +0000 (00:36 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 23 Mar 2009 23:36:19 +0000 (00:36 +0100)
commit7df4f694356a125e4553ca35b215fd9e88e858c5
treeb153e8aeb6439c3f7bc150ad9e6e3ff9d57849a0
parentb54fc8dd2c43888f2754505cca2b6e88604a8ffa
parentd563ffa6b319a4e401d096db9014a947590ca081
Merge branch 'topic/pcxhr' into for-linus
sound/pci/pcxhr/pcxhr.c
sound/pci/pcxhr/pcxhr.h