fb: fix reserved usage for 4.2
video: msm: add mdp version to id string

Conflicts:

	include/linux/fb.h