b6

Conflicts:
	arch/arm/boot/compressed/piggy.xzkern
	drivers/video/msm/mdp4_overlay.c