Linaro 4.8 fixes

Conflicts:
	drivers/staging/prima/Kbuild
	drivers/usb/gadget/f_qdss.c
	drivers/video/msm/mipi_novatek.c