diff options
| author | Daniel Vetter | 2015-03-30 16:37:08 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2015-03-30 16:37:08 +0200 |
| commit | 6e0aa8018f9c676b115b7ca6c20a056fc57c68a9 (patch) | |
| tree | b35393574b48dcc05c99599add7f8b0015de3913 /include/uapi/drm | |
| parent | drm/i915: Update DRIVER_DATE to 20150327 (diff) | |
| parent | Linux 4.0-rc6 (diff) | |
| download | kernel-qcow2-linux-6e0aa8018f9c676b115b7ca6c20a056fc57c68a9.tar.gz kernel-qcow2-linux-6e0aa8018f9c676b115b7ca6c20a056fc57c68a9.tar.xz kernel-qcow2-linux-6e0aa8018f9c676b115b7ca6c20a056fc57c68a9.zip | |
Merge tag 'v4.0-rc6' into drm-intel-next
Backmerge Linux 4.0-rc6 because conflicts are (again) getting out of
hand. To make sure we don't lose any bugfixes from the 4.0-rc5-rc6
flurry of patches we've applied them all to -next too.
Conflicts:
drivers/gpu/drm/i915/intel_display.c
Always take the version from -next, we've already handled all
conflicts with explicit cherrypicking.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'include/uapi/drm')
0 files changed, 0 insertions, 0 deletions