daviddrysdale Merge tag 'v4.11' into capsicum

Linux 4.11

Conflicts:
	Makefile

Latest commit de1a408

Sep 21, 2017