From ffcd8bcfc6e9655f31439a977b8b51f910626192 Mon Sep 17 00:00:00 2001
From: Antonio Ospite <ao2@amarulasolutions.com>
Date: Tue, 29 Jan 2013 12:56:28 +0100
Subject: [PATCH] --- yaml --- r: 353226 b: refs/heads/master c:
 d4dab5ab5bd0445420aa090185409bf3ae6ccd37 h: refs/heads/master v: v3

---
 [refs]                                                  | 2 +-
 trunk/Documentation/DocBook/writing-an-alsa-driver.tmpl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 824e6d435ffd..ef2185f4c26a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04044b819b21826f11f32e11aba54def635d8457
+refs/heads/master: d4dab5ab5bd0445420aa090185409bf3ae6ccd37
diff --git a/trunk/Documentation/DocBook/writing-an-alsa-driver.tmpl b/trunk/Documentation/DocBook/writing-an-alsa-driver.tmpl
index da2f443ab8ec..c0781bb1f9b5 100644
--- a/trunk/Documentation/DocBook/writing-an-alsa-driver.tmpl
+++ b/trunk/Documentation/DocBook/writing-an-alsa-driver.tmpl
@@ -2897,7 +2897,7 @@ struct _snd_pcm_runtime {
 
         <para>
           When the pcm supports the pause operation (given in the info
-        field of the hardware table), the <constant>PAUSE_PUSE</constant>
+        field of the hardware table), the <constant>PAUSE_PUSH</constant>
         and <constant>PAUSE_RELEASE</constant> commands must be
         handled here, too. The former is the command to pause the pcm,
         and the latter to restart the pcm again. 
@@ -3084,7 +3084,7 @@ struct _snd_pcm_runtime {
       <section id="pcm-interface-interrupt-handler-timer">
         <title>High frequency timer interrupts</title>
         <para>
-	This happense when the hardware doesn't generate interrupts
+	This happens when the hardware doesn't generate interrupts
         at the period boundary but issues timer interrupts at a fixed
         timer rate (e.g. es1968 or ymfpci drivers). 
         In this case, you need to check the current hardware