summaryrefslogtreecommitdiff
path: root/sound/core
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-10-29 16:40:00 +0100
committerTakashi Iwai <tiwai@suse.de>2008-10-29 16:40:00 +0100
commit0552f297951d0ab3a1027f9b06fa40c9be8378ba (patch)
treebac534a1d5798e3d07d29e8dd8a5f5f2f5ef20fb /sound/core
parent0a9b86381c76e9d33a9b6edb66aef32d7a3306e3 (diff)
parent0cbf00980f0fc4cc064a15ab3dfce19b5fae9130 (diff)
parent366840d7e1ece4331bb3ccc2a53e3bc355529f21 (diff)
Merge branches 'topic/fix/hda' and 'topic/fix/misc' into for-linus