Update8

Conflicts:

	arch/arm/configs/u1_defconfig
	drivers/media/video/samsung/Makefile