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)
commitdb5dfef7121752ec9053160e0a7804815d4608c3
tree6cdd00f9fcbaceadcf7e173ff671abbcf4f95711
parent0d841ac0ec213f70ab59d65129e80f229846fadf
parent8569de68e79e94cce6709831edd94accb6942ade
Merge tag 'sphinx-4.8' of git://git.lwn.net/linux into topic/drm-misc

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>
Makefile