Merge branch 'topic/misc' into for-next

author Takashi Iwai <tiwai@suse.de>

Wed, 18 May 2011 09:44:58 +0000 (11:44 +0200)

committer Takashi Iwai <tiwai@suse.de>

Wed, 18 May 2011 09:44:58 +0000 (11:44 +0200)
author Takashi Iwai <tiwai@suse.de>
Wed, 18 May 2011 09:44:58 +0000 (11:44 +0200)
committer Takashi Iwai <tiwai@suse.de>
Wed, 18 May 2011 09:44:58 +0000 (11:44 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc sound/usb/format.c
Simple merge
diff --cc sound/usb/quirks.c
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Wed, 18 May 2011 09:44:58 +0000 (11:44 +0200)
committer	Takashi Iwai <tiwai@suse.de>
	Wed, 18 May 2011 09:44:58 +0000 (11:44 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
sound/usb/format.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/usb/quirks.c	patch \|	diff1 \|	diff2 \|	blob \| history