Merge tag 'sphinx-4.8' of git://git.lwn.net/linux into topic/drm-misc
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 14 Jun 2016 20:42:10 +0000 (22:42 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 14 Jun 2016 20:42:10 +0000 (22:42 +0200)
Stable tag for sphinx work

Pull current state of the sphinx rework from Jonathan into drm-misc so
that we can start converting gpu.tmpl.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
1  2 
Makefile

diff --cc Makefile
Simple merge