From cd56b3bbe1d809a8429a28d4e75cef940cb34c41 Mon Sep 17 00:00:00 2001
From: Michael Witten <mfwitten@gmail.com>
Date: Thu, 25 Aug 2011 18:49:11 +0000
Subject: [PATCH] --- yaml --- r: 275199 b: refs/heads/master c:
 5b658bf2bf9e47f9a67cd26b1c69e4441eaf04fc h: refs/heads/master i:   275197:
 41087c2687c8679db806b866d3181802912a035c   275195:
 23534e6846965bd4b8ba8e896bfc5a423fb968ca   275191:
 03ecfb2aba07f2b91066662c4443da879314153c   275183:
 8d26c3ffa5ede892fc34ab6e184e55a6014af1c2   275167:
 4baf1ed572033806c8c00321c79abb5dc7d32846   275135:
 bfd38527860bbe5a1eb0394eddc226537516f35d   275071:
 ab5b71d04a10031b4850aa9f44c0bd24d5a81375   274943:
 a6508ab2abb1b771b102de1c601410707696809a v: v3

---
 [refs]                               | 2 +-
 trunk/Documentation/DocBook/drm.tmpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6389a225e97d..78569c8f04c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f07faf693c59b449b6637ea056e5826c85dcd265
+refs/heads/master: 5b658bf2bf9e47f9a67cd26b1c69e4441eaf04fc
diff --git a/trunk/Documentation/DocBook/drm.tmpl b/trunk/Documentation/DocBook/drm.tmpl
index 1b2e3c37e377..d2f1ddaa3ca0 100644
--- a/trunk/Documentation/DocBook/drm.tmpl
+++ b/trunk/Documentation/DocBook/drm.tmpl
@@ -346,7 +346,7 @@
       </para>
       <para>
 	If your device supports interrupt generation, you may want to
-	setup an interrupt handler at driver load time as well.  This
+	set up an interrupt handler at driver load time as well.  This
 	is done using the drm_irq_install() function.  If your device
 	supports vertical blank interrupts, it should call
 	drm_vblank_init() to initialize the core vblank handling code before