Merge branch 'topic/pcxhr-update' into to-push
authorTakashi Iwai <tiwai@suse.de>
Thu, 25 Dec 2008 10:40:31 +0000 (11:40 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 25 Dec 2008 10:40:31 +0000 (11:40 +0100)
commita9c3c7e04b9a744eafb2e87c770e7300bbffa375
tree9ffb2df20f57c8a71386c0f50937149864170313
parentcc4910850f93a8bb1cbafad038fd40f6da68c783
parentade9b2fb9bf8114f77eefc70b9042417e62acf72
Merge branch 'topic/pcxhr-update' into to-push
sound/pci/pcxhr/pcxhr.c
sound/pci/pcxhr/pcxhr_core.c