]> www.infradead.org Git - users/hch/xfs.git/commitdiff
projects / users / hch / xfs.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3488229 57127ef)
Merge patches merged by Jani while I was on vacation.
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 7 Jul 2014 08:15:44 +0000 (10:15 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 7 Jul 2014 08:15:44 +0000 (10:15 +0200)
Jani apparently didn't rebase onto latest drm-intel-next so a merge is
in order.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
1  2 
drivers/gpu/drm/i915/i915_drv.h patch | diff1 | diff2 | blob | history

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