Boeffla-Sound: Engine 1.6.0

Conflicts:
	sound/soc/codecs/wm8994.c