Merge commit '2c36c2ce00987a416bf75681742617a0f85335eb' into m0-broken

Conflicts:
	sound/soc/soc-core.c
Fix Samsung crap, again