summaryrefslogtreecommitdiffstats
path: root/sound/pci/pcxhr/pcxhr.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-11-18 13:49:39 +0100
committerTakashi Iwai <tiwai@suse.de>2008-11-18 13:49:39 +0100
commitef71b1b87521ff93ed77b3e8f3e149afb392761c (patch)
tree6da26e9b635b56199fa1eed35e493babb52cdec8 /sound/pci/pcxhr/pcxhr.c
parent9bf1a2445f3c569098b8de7097ca324e65abecc2 (diff)
parentc5d08bb567874e410210cf7d21a25f28fcceb0a7 (diff)
parentd6f35e3f0da14a5eb02114708d88ae2f59dc8283 (diff)
Merge branches 'topic/fix/hda' and 'topic/fix/misc' into for-linus