f0c1f7
Merge branches 'users/tiwai/master/for-next' and 'users/vbabka/master/for-next' into master Pull an x86 config update from Takashi Iwai. Pull an mm related config update from Vlastimil Babka.