summaryrefslogtreecommitdiff
path: root/sound/oss
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-10-27 17:08:11 +0100
committerTakashi Iwai <tiwai@suse.de>2008-10-27 17:08:11 +0100
commit0a9b86381c76e9d33a9b6edb66aef32d7a3306e3 (patch)
treec42274e9a2d1e8dad7296e511bbc69c846ece36c /sound/oss
parentbfd4e66b8d0dfcdbe3f5ccff45757f098bdbb26e (diff)
parentc3e5203bed1999df716e3c7119f6749523eb952f (diff)
parente044c39ae258678d6ebb09fccb2a0fdf7ec51847 (diff)
parent2f1e593d4209d0194f9639c5d11aa91171435963 (diff)
parent2f5ad54ea6e2e38156bfb889964deee991f3087a (diff)
Merge branches 'topic/fix/asoc', 'topic/fix/hda', 'topic/fix/misc' and 'topic/pci-ioremap-bar' into for-linus