Back-merge for resolving the conflict of fixup entries added in both
branches.
Signed-off-by: Takashi Iwai <tiwai@suse.de>