From 850246edf985ddb9ff214dbc387ea4901e1332f6 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Wed, 15 Oct 2008 22:04:00 -0700
Subject: [PATCH] --- yaml --- r: 114878 b: refs/heads/master c:
 60836eb63b941f407dc2a609f3f0f34fd74ef6c3 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/telephony/ixj.c   | 2 --
 trunk/include/linux/telephony.h | 4 ----
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 7a6f22baf397..67456b25effb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b563cf59c4d67da7d671788a9848416bfa4180ab
+refs/heads/master: 60836eb63b941f407dc2a609f3f0f34fd74ef6c3
diff --git a/trunk/drivers/telephony/ixj.c b/trunk/drivers/telephony/ixj.c
index ec7aeb502d15..41b6530b8f25 100644
--- a/trunk/drivers/telephony/ixj.c
+++ b/trunk/drivers/telephony/ixj.c
@@ -42,8 +42,6 @@
  ***************************************************************************/
 
 /*
- * $Log: ixj.c,v $
- *
  * Revision 4.8  2003/07/09 19:39:00  Daniele Bellucci
  * Audit some copy_*_user and minor cleanup.
  *
diff --git a/trunk/include/linux/telephony.h b/trunk/include/linux/telephony.h
index 0d0cf2a1e7bc..5b2b6261f193 100644
--- a/trunk/include/linux/telephony.h
+++ b/trunk/include/linux/telephony.h
@@ -28,10 +28,6 @@
  * ON AN "AS IS" BASIS, AND QUICKNET TECHNOLOGIES, INC. HAS NO OBLIGATION
  * TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  *
- * Version:       $Revision: 4.2 $
- *
- * $Id: telephony.h,v 4.2 2001/08/06 07:09:43 craigs Exp $
- *
  *****************************************************************************/
 
 #ifndef TELEPHONY_H