Merge branch 'master' into staging

Conflicts:
	src/i965_drv_video.c

diff --cc configure.ac
Simple merge

diff --cc src/gen7_mfd.c
Simple merge

diff --cc src/i965_drv_video.c
index ddbfe30,9dc66f0..ea35ad2
--- 1/src/i965_drv_video.c
--- 2/src/i965_drv_video.c
+++ b/src/i965_drv_video.c
@@@ -1081,15 -970,9 +1081,17 @@@ i965_create_buffer_internal(VADriverCon
      case VAEncSequenceParameterBufferType:
      case VAEncPictureParameterBufferType:
      case VAEncSliceParameterBufferType:
 +    case VAEncDecRefPicMarkingBufferH264Type:
 +    case VAEncPackedHeaderParameterBufferType:
 +    case VAEncPackedHeaderDataBufferType:
 +    case VAProcPipelineParameterBufferType:
 +    case VAProcInputParameterBufferType:
 +    case VAProcFilterBaseParameterBufferType:
 +    case VAProcFilterDeinterlacingParameterBufferType:
 +    case VAProcFilterProcAmpParameterBufferType:
+ #ifdef HAVE_JPEG_DECODING
      case VAHuffmanTableBufferType:
+ #endif
          /* Ok */
          break;