Merge branch 'topic/workq-update' into topic/misc

author Takashi Iwai <tiwai@suse.de>

Mon, 13 Dec 2010 08:29:52 +0000 (09:29 +0100)

committer Takashi Iwai <tiwai@suse.de>

Mon, 13 Dec 2010 08:29:52 +0000 (09:29 +0100)
author Takashi Iwai <tiwai@suse.de>
Mon, 13 Dec 2010 08:29:52 +0000 (09:29 +0100)
committer Takashi Iwai <tiwai@suse.de>
Mon, 13 Dec 2010 08:29:52 +0000 (09:29 +0100)
diff --cc sound/core/pcm_native.c
Simple merge
diff --cc sound/core/sound.c
Simple merge
diff --cc sound/pci/hda/patch_realtek.c
Simple merge
diff --cc sound/pci/oxygen/oxygen_lib.c
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Mon, 13 Dec 2010 08:29:52 +0000 (09:29 +0100)
committer	Takashi Iwai <tiwai@suse.de>
	Mon, 13 Dec 2010 08:29:52 +0000 (09:29 +0100)
		1	2
sound/core/pcm_native.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/core/sound.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/hda/patch_realtek.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/pci/oxygen/oxygen_lib.c	patch \|	diff1 \|	diff2 \|	blob \| history