6bff22
Merge branch 'users/tiwai/master/for-next' into master Pull an x86 config update from Takashi Iwai.