Merge branch 'topic/pcsp-fix' into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Sat, 20 Dec 2008 22:39:47 +0000 (23:39 +0100)
committerTakashi Iwai <tiwai@suse.de>
Sat, 20 Dec 2008 22:39:47 +0000 (23:39 +0100)
commit55fa518867978e1f5fd8353098f80d125ac734d7
tree3502b331c1f9ec4cac25dc8ba30b6a0a324e350c
parentbb1f24bf00a85f666b56a09b7cdbfd221af16c2c
parenteea0579fc85e64e9f05361d5aacf496fe7a151aa
Merge branch 'topic/pcsp-fix' into topic/misc
sound/pci/mixart/mixart.c
sound/pci/pcxhr/pcxhr.c