Merge branch 'Origin'

Conflicts:
	sbuild.sh
	sound/soc/codecs/wm8994_herring.c