Merge branch 'jb_mr2_geeb' into jb_mr2_geeb_f

Conflicts:
	include/linux/msm_mdp.h
Merge remote-tracking branch 'faux123/jb_mr2' into jb_mr2_geeb_f

Conflicts:
	Makefile
geeb_f_defcongig: full rework