Merge tag 'v3.11.2' into 3.11/master

This is the 3.11.2 stable release

Conflicts:
	Makefile
	drivers/hid/usbhid/hid-quirks.c
Merge branch '3.11/misc' into 3.11/master