Merge branch 'topic/workq-update' into topic/misc
Takashi Iwai [Mon, 13 Dec 2010 08:29:52 +0000 (09:29 +0100)]
1  2 
sound/core/pcm_native.c
sound/core/sound.c
sound/pci/hda/patch_realtek.c
sound/pci/oxygen/oxygen_lib.c

Simple merge
Simple merge
Simple merge
Simple merge