summaryrefslogtreecommitdiffstats
path: root/include/drm-uapi/README
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2017-08-04 12:52:46 -0700
committerJason Ekstrand <[email protected]>2017-08-28 19:33:35 -0700
commit3cd26d981b007c2667156c2a5049de96f1bf9cf1 (patch)
treea6ecf07a6ac445742f69c43d519595adc2f2296d /include/drm-uapi/README
parentae8365a9eb017161c294f2a9171d0cbfd7249e20 (diff)
drm-uapi: Update headers from drm-next
Reviewed-by: Lionel Landwerlin <[email protected]>
Diffstat (limited to 'include/drm-uapi/README')
-rw-r--r--include/drm-uapi/README8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/drm-uapi/README b/include/drm-uapi/README
index eb37096031b..d67fb562f14 100644
--- a/include/drm-uapi/README
+++ b/include/drm-uapi/README
@@ -10,9 +10,9 @@ $ make headers_install INSTALL_HDR_PATH=/path/to/install
The last update was done at the following kernel commit :
-commit 6d61e70ccc21606ffb8a0a03bd3aba24f659502b
-Merge: 338ffbf7cb5e c0bc126f97fb
+commit 7846b12fe0b5feab5446d892f41b5140c1419109
+Merge: 7ebdb0d d78acfe
Author: Dave Airlie <[email protected]>
-Date: Tue Jun 27 07:24:49 2017 +1000
+Date: Tue Aug 29 10:38:14 2017 +1000
- Backmerge tag 'v4.12-rc7' into drm-next
+ Merge branch 'drm-vmwgfx-next' of git://people.freedesktop.org/~syeh/repos_linux into drm-next