projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1ff27a3 e42391c)
Merge tag 'v4.0-rc6' into drm-intel-next
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 30 Mar 2015 14:37:08 +0000 (16:37 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 30 Mar 2015 14:37:08 +0000 (16:37 +0200)
commit6e0aa8018f9c676b115b7ca6c20a056fc57c68a9
treeb35393574b48dcc05c99599add7f8b0015de3913tree | snapshot
parent1ff27a3443addb19af609245b218fa510c7d37ddcommit | diff
parente42391cd048809d903291d07f86ed3934ce138e9commit | diff
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>
drivers/gpu/drm/i915/i915_gem.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.