Squashed update to 3.1.0
Merge branch 'cm-11.0' of https://github.com/Giugiu19/SpeedKernel-s2plus into cm-11.0

Conflicts:
	MAINTAINERS
	Makefile