Samsung Update 11

Conflicts:
	drivers/video/Makefile
	drivers/video/fbmem.c