Pull in new unified qualcomm camera source. Being updating cameras
on vigor to utilize the new format.

Conflicts:
	arch/arm/configs/holiday_defconfig
	arch/arm/mach-msm/board-ruby.c
	arch/arm/mach-msm/devices-msm8x60.c
	arch/arm/mach-msm/devices-msm8x60.h
	arch/arm/mach-msm/include/mach/board.h
	drivers/media/video/msm/Makefile
	drivers/media/video/msm/msm_camera-8x60.c
	drivers/media/video/msm/msm_io_8x60.c
	drivers/media/video/msm/msm_vpe1_8x60.c
	drivers/media/video/msm/sensors/Makefile