Merge branch 'fix/misc' into for-next

author Takashi Iwai <tiwai@suse.de>

Mon, 2 Nov 2009 13:12:14 +0000 (14:12 +0100)

committer Takashi Iwai <tiwai@suse.de>

Mon, 2 Nov 2009 13:12:14 +0000 (14:12 +0100)
author Takashi Iwai <tiwai@suse.de>
Mon, 2 Nov 2009 13:12:14 +0000 (14:12 +0100)
committer Takashi Iwai <tiwai@suse.de>
Mon, 2 Nov 2009 13:12:14 +0000 (14:12 +0100)
diff --cc Documentation/sound/alsa/ALSA-Configuration.txt
Simple merge
author	Takashi Iwai <tiwai@suse.de>
	Mon, 2 Nov 2009 13:12:14 +0000 (14:12 +0100)
committer	Takashi Iwai <tiwai@suse.de>
	Mon, 2 Nov 2009 13:12:14 +0000 (14:12 +0100)