]> www.infradead.org Git - linux.git/commitdiff
projects / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c7f0c2 f22e6e8)
Merge tag 'v4.0-rc7' into drm-next
authorDave Airlie <airlied@redhat.com>
Wed, 8 Apr 2015 21:48:27 +0000 (07:48 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 8 Apr 2015 21:48:27 +0000 (07:48 +1000)
Linux 4.0-rc7

Requested by Alex for fixes -next needs.

Conflicts:
drivers/gpu/drm/i915/intel_sprite.c

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_sprite.c patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc drivers/gpu/drm/i915/intel_sprite.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.