diff --git a/[refs] b/[refs] index c8445c1c42b0..a32a8d0873cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 670c1ef6508c8fdd83dc55968fc1ce7284d849a7 +refs/heads/master: e4949f2974167f93961d58ca67cfe949af9d5e09 diff --git a/trunk/Documentation/DocBook/drm.tmpl b/trunk/Documentation/DocBook/drm.tmpl index c9cbb3fe0e6a..9a4c06ddebdd 100644 --- a/trunk/Documentation/DocBook/drm.tmpl +++ b/trunk/Documentation/DocBook/drm.tmpl @@ -1611,10 +1611,10 @@ void intel_crt_init(struct drm_device *dev) - + - Mid-layer Helper Functions + Mode Setting Helper Functions The CRTC, encoder and connector functions provided by the drivers implement the DRM API. They're called by the DRM core and ioctl handlers