tree cfadc495e149396050f6a19550c361c2abd64619
parent 0a71df08a19f971c19c7d9d873acea1743d49ffb
parent 4927ac1f0981b97908c5dd985dcff1d8c2861427
author Divya Sharma <c_shard@codeaurora.org> 1446657873 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446657873 -0800
mergetag object 4927ac1f0981b97908c5dd985dcff1d8c2861427
 type commit
 tag android-6.0.0_r26
 tagger The Android Open Source Project <initial-contribution@android.com> 1446052347 -0700
 
 Android 6.0.0 release 26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYxAfsACgkQ6K0/gZqxDngzoQCdEAKUFIw4Khs98hdNj/uzg7sW
 a9sAn07DoNLGbM6sAv16LbPuI6TC5QeZ
 =t8TH
 -----END PGP SIGNATURE-----

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