Linaro 4.8 fixes

Conflicts:
	arch/arm/boot/compressed/Makefile
	drivers/staging/prima/Kbuild