From cb536c429b707b4e804337502986f8a3ed7f9d44 Mon Sep 17 00:00:00 2001
From: matt mooney <mfm@muteddisk.com>
Date: Sat, 14 May 2011 03:55:16 -0700
Subject: [PATCH] --- yaml --- r: 249715 b: refs/heads/master c:
 88d6f40839856552bed131f368f6cd33595c7496 h: refs/heads/master i:   249713:
 1cf70308a7be96bdc7dbe93c7adc82ccfa6b739f   249711:
 6a5cea2c4811b4779e50871a26e40f0a381e3aeb v: v3

---
 [refs]                                                    | 2 +-
 trunk/drivers/staging/usbip/userspace/src/bind-driver.c   | 1 -
 trunk/drivers/staging/usbip/userspace/src/usbip.c         | 4 +---
 trunk/drivers/staging/usbip/userspace/src/usbip_network.c | 1 -
 trunk/drivers/staging/usbip/userspace/src/usbipd.c        | 4 +---
 trunk/drivers/staging/usbip/userspace/src/utils.c         | 1 -
 6 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 20844cee9db0..7b1940e7096a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d762f5e10cdac605d6d3fb57ce36ed4d25b4302c
+refs/heads/master: 88d6f40839856552bed131f368f6cd33595c7496
diff --git a/trunk/drivers/staging/usbip/userspace/src/bind-driver.c b/trunk/drivers/staging/usbip/userspace/src/bind-driver.c
index 12918c1fd74d..955c86b23f0f 100644
--- a/trunk/drivers/staging/usbip/userspace/src/bind-driver.c
+++ b/trunk/drivers/staging/usbip/userspace/src/bind-driver.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  *
  * Copyright (C) 2005-2007 Takahiro Hirofuchi
  */
diff --git a/trunk/drivers/staging/usbip/userspace/src/usbip.c b/trunk/drivers/staging/usbip/userspace/src/usbip.c
index 3943d15fd81e..01a562866b5d 100644
--- a/trunk/drivers/staging/usbip/userspace/src/usbip.c
+++ b/trunk/drivers/staging/usbip/userspace/src/usbip.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  *
  * Copyright (C) 2005-2007 Takahiro Hirofuchi
  */
@@ -17,8 +16,7 @@
 #include <fcntl.h>
 #include <glib.h>
 
-static const char version[] = PACKAGE_STRING
-	" ($Id$)";
+static const char version[] = PACKAGE_STRING;
 
 
 /* /sys/devices/platform/vhci_hcd/usb6/6-1/6-1:1.1  -> 1 */
diff --git a/trunk/drivers/staging/usbip/userspace/src/usbip_network.c b/trunk/drivers/staging/usbip/userspace/src/usbip_network.c
index a3a955ba6b00..726173e56342 100644
--- a/trunk/drivers/staging/usbip/userspace/src/usbip_network.c
+++ b/trunk/drivers/staging/usbip/userspace/src/usbip_network.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  *
  * Copyright (C) 2005-2007 Takahiro Hirofuchi
  */
diff --git a/trunk/drivers/staging/usbip/userspace/src/usbipd.c b/trunk/drivers/staging/usbip/userspace/src/usbipd.c
index 441dcdeee03e..409d0644178c 100644
--- a/trunk/drivers/staging/usbip/userspace/src/usbipd.c
+++ b/trunk/drivers/staging/usbip/userspace/src/usbipd.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  *
  * Copyright (C) 2005-2007 Takahiro Hirofuchi
  */
@@ -31,8 +30,7 @@
 
 #include <glib.h>
 
-static const char version[] = PACKAGE_STRING
-	" ($Id$)";
+static const char version[] = PACKAGE_STRING;
 
 
 static int send_reply_devlist(int sockfd)
diff --git a/trunk/drivers/staging/usbip/userspace/src/utils.c b/trunk/drivers/staging/usbip/userspace/src/utils.c
index 403c30ff902e..8f441089b645 100644
--- a/trunk/drivers/staging/usbip/userspace/src/utils.c
+++ b/trunk/drivers/staging/usbip/userspace/src/utils.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  *
  * Copyright (C) 2005-2007 Takahiro Hirofuchi
  */