Merge remote branch 'origin/master' into libdrm

diff --cc intel/intel_bufmgr.c
Simple merge

diff --cc intel/intel_bufmgr.h
Simple merge

diff --cc intel/intel_bufmgr_gem.c
Simple merge

diff --cc intel/intel_bufmgr_priv.h
Simple merge

diff --cc nouveau/nouveau_class.h
Simple merge

diff --cc radeon/radeon_bo.h
Simple merge