summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-11-21 08:39:36 +0100
committerTakashi Iwai <tiwai@suse.de>2008-11-21 08:39:36 +0100
commitc879c634c928223765cf50103ddaf32f2a55fed0 (patch)
treeb49c79e703c6da708449b13b120517fb0c54fd7d /sound/pci
parentef71b1b87521ff93ed77b3e8f3e149afb392761c (diff)
parentb0fc5e043401df4cd243352f1030c4d23e767347 (diff)
parenta39c4ad1089be34d8dc66e926e93a52c44993a0a (diff)
downloadlinux-c879c634c928223765cf50103ddaf32f2a55fed0.tar.gz
linux-c879c634c928223765cf50103ddaf32f2a55fed0.tar.bz2
linux-c879c634c928223765cf50103ddaf32f2a55fed0.zip
Merge branches 'topic/fix/hda' and 'topic/fix/sound-core' into for-linus