Merge branch 'topic/workq-update' into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Mon, 13 Dec 2010 08:29:52 +0000 (09:29 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 13 Dec 2010 08:29:52 +0000 (09:29 +0100)
commit354d14b3f53cc749c5d26d4ba7280d1e931d6bc4
tree59b597e44902d8db8bde7deac1e7e707327c6fe6
parent5144c534d16529bc469396211131e8935589f833
parent5b84ba26a9672e615897234fa5efd3eea2d6b295
Merge branch 'topic/workq-update' into topic/misc
sound/core/pcm_native.c
sound/core/sound.c
sound/pci/hda/patch_realtek.c
sound/pci/oxygen/oxygen_lib.c