Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  drm: add nouveau_{ioctl,class}.h for nvif
  drm: add DRM_NOUVEAU_NVIF and CLIENT,DEVICE,CHAN
  nouveau: add DRM_NOUVEAU_GEM_SET_ERROR_NOTIFIER
  libdrm: Add DRM_IOCTL_TEGRA_(START|STOP)_KEEPON ioctls
  libdrm: Add DRM_TEGRA_(G|S)ET_CLK_RATE ioctls
  libdrm: Add GEM as Alloc/Free ioctls
  libdrm: Add NOUVEAU_GEM_DOMAIN_COHERENT
  libdrm: Add DRM_NOUVEAU_GEM_SET_INFO
  libdrm: nouveau: Add GEM_SET_INFO ioctl
  Revert "libdrm: Add coherent flag to set_tiling"
  libdrm: Add coherent flag to set_tiling
  libdrm: Add drm_nouveau_gem_set_tiling
  libdrm: Add drm_nouveau_gem_pushbuf_2
  libdrm: Add rotation property fields

Change-Id: Ib1aa7aa81772a2435da74987c57604b399a49de8