diff options
author | Lionel Landwerlin <[email protected]> | 2017-12-04 15:12:40 +0000 |
---|---|---|
committer | Lionel Landwerlin <[email protected]> | 2017-12-04 18:05:20 +0000 |
commit | aa8a2a867056a93467623efbca950b51e592e67d (patch) | |
tree | 6a1cf37ebe893cafa26194e26ea51772b7177258 /include/drm-uapi/README | |
parent | 1e565bc6cea7e82925f066f797b3425cd2e69280 (diff) |
drm-uapi: Update drm/i915 headers from drm-next
Taken from drm-next ca797d29cd63e7b71b4eea29aff3b1cefd1ecb59
Signed-off-by: Lionel Landwerlin <[email protected]>
Reviewed-by: Rafael Antognolli <[email protected]>
Diffstat (limited to 'include/drm-uapi/README')
-rw-r--r-- | include/drm-uapi/README | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/drm-uapi/README b/include/drm-uapi/README index 27de91cad0c..53dd711dad5 100644 --- a/include/drm-uapi/README +++ b/include/drm-uapi/README @@ -13,9 +13,9 @@ $ make headers_install INSTALL_HDR_PATH=/path/to/install The last update was done at the following kernel commit : -commit 7846b12fe0b5feab5446d892f41b5140c1419109 -Merge: 7ebdb0d d78acfe +commit ca797d29cd63e7b71b4eea29aff3b1cefd1ecb59 +Merge: 2c1c55cb75a9 010d118c2061 Author: Dave Airlie <[email protected]> -Date: Tue Aug 29 10:38:14 2017 +1000 +Date: Mon Dec 4 09:40:35 2017 +1000 - Merge branch 'drm-vmwgfx-next' of git://people.freedesktop.org/~syeh/repos_linux into drm-next + Merge tag 'drm-intel-next-2017-11-17-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-next |