Merge remote-tracking branch 'caf/jb_2.6' into 12.1.A.1.xxx

Conflicts:
	arch/arm/kernel/process.c
	arch/arm/mach-msm/Kconfig
	arch/arm/mm/mmu.c
	drivers/media/video/msm/server/msm_cam_server.c
	drivers/video/msm/msm_fb_panel.h
	mm/Kconfig