Merge branch 'upstream' into topic/asoc

author Takashi Iwai <tiwai@suse.de>

Mon, 1 Dec 2008 17:02:17 +0000 (18:02 +0100)

committer Takashi Iwai <tiwai@suse.de>

Mon, 1 Dec 2008 17:02:17 +0000 (18:02 +0100)
author Takashi Iwai <tiwai@suse.de>
Mon, 1 Dec 2008 17:02:17 +0000 (18:02 +0100)
committer Takashi Iwai <tiwai@suse.de>
Mon, 1 Dec 2008 17:02:17 +0000 (18:02 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc sound/soc/soc-core.c
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Mon, 1 Dec 2008 17:02:17 +0000 (18:02 +0100)
committer	Takashi Iwai <tiwai@suse.de>
	Mon, 1 Dec 2008 17:02:17 +0000 (18:02 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-core.c	patch \|	diff1 \|	diff2 \|	blob \| history