Merge branch 'master' into staging

Merge branch 'master' into staging

Conflicts:
	NEWS
	configure.ac
	src/Makefile.am
	src/gen6_mfc.c
	src/gen6_mfd.c
	src/gen6_vme.c
	src/gen6_vme.h
	src/gen75_mfc.c
	src/gen75_mfd.c
	src/gen75_vme.c
	src/gen75_vpp_vebox.c
	src/gen75_vpp_vebox.h
	src/gen7_mfd.c
	src/i965_avc_bsd.c
	src/i965_decoder.h
	src/i965_decoder_utils.c
	src/i965_defines.h
	src/i965_drv_video.c
	src/i965_drv_video.h
	src/i965_encoder.c
	src/i965_encoder.h
	src/i965_output_dri.c
	src/i965_post_processing.c
	src/i965_post_processing.h
	src/i965_render.c
	src/i965_structs.h
	src/intel_driver.c
	src/object_heap.c
	src/shaders/post_processing/Common/AYUV_Load_16x8.asm
	src/shaders/post_processing/Common/AYUV_Load_16x8.inc
	src/shaders/post_processing/Common/Init_All_Regs.asm
	src/shaders/post_processing/Makefile.am
	src/shaders/post_processing/gen5_6/Common/AYUV_Load_16x8.asm
	src/shaders/post_processing/gen5_6/Common/AYUV_Load_16x8.inc
	src/shaders/post_processing/gen5_6/Common/Init_All_Regs.asm
	src/shaders/post_processing/gen5_6/Common/NV12_Load_8x4.asm
	src/shaders/post_processing/gen5_6/Common/RGBX_Load_16x8.asm
	src/shaders/post_processing/gen5_6/Common/RGBX_Load_16x8.inc
	src/shaders/post_processing/gen5_6/Makefile.am
	src/shaders/post_processing/gen5_6/nv12_avs_nv12.g4b.gen5
	src/shaders/post_processing/gen5_6/nv12_avs_nv12.g6b
	src/shaders/post_processing/gen5_6/nv12_dn_nv12.g4b.gen5
	src/shaders/post_processing/gen5_6/nv12_dn_nv12.g6b
	src/shaders/post_processing/gen5_6/nv12_dndi_nv12.g4b.gen5
	src/shaders/post_processing/gen5_6/nv12_dndi_nv12.g6b
	src/shaders/post_processing/gen5_6/nv12_load_save_nv12.g4b.gen5
	src/shaders/post_processing/gen5_6/nv12_load_save_nv12.g6b
	src/shaders/post_processing/gen5_6/nv12_load_save_pa.g4b.gen5
	src/shaders/post_processing/gen5_6/nv12_load_save_pa.g6b
	src/shaders/post_processing/gen5_6/nv12_load_save_pl3.g4b.gen5
	src/shaders/post_processing/gen5_6/nv12_load_save_pl3.g6b
	src/shaders/post_processing/gen5_6/pa_load_save_nv12.g4b.gen5
	src/shaders/post_processing/gen5_6/pa_load_save_nv12.g6b
	src/shaders/post_processing/gen5_6/pa_load_save_pl3.g4b.gen5
	src/shaders/post_processing/gen5_6/pa_load_save_pl3.g6b
	src/shaders/post_processing/gen5_6/pl3_load_save_nv12.g4b.gen5
	src/shaders/post_processing/gen5_6/pl3_load_save_nv12.g6b
	src/shaders/post_processing/gen5_6/pl3_load_save_pa.g4b.gen5
	src/shaders/post_processing/gen5_6/pl3_load_save_pa.g6b
	src/shaders/post_processing/gen5_6/pl3_load_save_pl3.g4b.gen5
	src/shaders/post_processing/gen5_6/pl3_load_save_pl3.g6b
	src/shaders/post_processing/gen7/EOT.g4a
	src/shaders/post_processing/gen7/Makefile.am
	src/shaders/post_processing/gen7/PA_AVS_Buf_0.g4a
	src/shaders/post_processing/gen7/PA_AVS_Buf_1.g4a
	src/shaders/post_processing/gen7/PA_AVS_Buf_2.g4a
	src/shaders/post_processing/gen7/PA_AVS_Buf_3.g4a
	src/shaders/post_processing/gen7/PL2_AVS_Buf_0.g4a
	src/shaders/post_processing/gen7/PL2_AVS_Buf_1.g4a
	src/shaders/post_processing/gen7/PL2_AVS_Buf_2.g4a
	src/shaders/post_processing/gen7/PL2_AVS_Buf_3.g4a
	src/shaders/post_processing/gen7/PL3_AVS_Buf_0.g4a
	src/shaders/post_processing/gen7/PL3_AVS_Buf_1.g4a
	src/shaders/post_processing/gen7/PL3_AVS_Buf_2.g4a
	src/shaders/post_processing/gen7/PL3_AVS_Buf_3.g4a
	src/shaders/post_processing/gen7/Save_AVS_NV12.g4a
	src/shaders/post_processing/gen7/Save_AVS_PA.g4a
	src/shaders/post_processing/gen7/Save_AVS_PL3.g4a
	src/shaders/post_processing/gen7/Save_AVS_RGB.g4a
	src/shaders/post_processing/gen7/Set_AVS_Buf_0123_BGRA.g4a
	src/shaders/post_processing/gen7/Set_AVS_Buf_0123_PL2.g4a
	src/shaders/post_processing/gen7/Set_AVS_Buf_0123_PL3.g4a
	src/shaders/post_processing/gen7/Set_AVS_Buf_0123_VUYA.g4a
	src/shaders/post_processing/gen7/Set_AVS_Buf_0123_VYUA.g4a
	src/shaders/post_processing/gen7/Set_Layer_0.g4a
	src/shaders/post_processing/gen7/VP_Setup.g4a
	src/shaders/vme/Makefile.am
	src/shaders/vme/inter_frame_haswell.asm
	src/shaders/vme/inter_frame_haswell.g75b
	src/shaders/vme/intra_frame_haswell.asm
	src/shaders/vme/intra_frame_haswell.g75b
	src/shaders/vme/vme75.inc
	src/shaders/vme/vme7_mpeg2.inc