From 62da4ac37e1c02aac74f1dece80271cd3036b4b1 Mon Sep 17 00:00:00 2001
From: "Hans J. Koch" <hjk@hansjkoch.de>
Date: Sat, 30 Oct 2010 00:36:47 +0200
Subject: [PATCH] --- yaml --- r: 222832 b: refs/heads/master c:
 318af55ddd38bdaaa2b57f5c3bd394f3ce3a2610 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/uio/uio.c          | 2 +-
 trunk/drivers/uio/uio_cif.c      | 2 +-
 trunk/drivers/uio/uio_netx.c     | 2 +-
 trunk/include/linux/uio_driver.h | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 8838449a2c12..c7092bee61d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b17cd8d69a75f921d9d444cc3ac9b5b1d0b66ca0
+refs/heads/master: 318af55ddd38bdaaa2b57f5c3bd394f3ce3a2610
diff --git a/trunk/drivers/uio/uio.c b/trunk/drivers/uio/uio.c
index a858d2b87b94..51fe1795d5a8 100644
--- a/trunk/drivers/uio/uio.c
+++ b/trunk/drivers/uio/uio.c
@@ -3,7 +3,7 @@
  *
  * Copyright(C) 2005, Benedikt Spranger <b.spranger@linutronix.de>
  * Copyright(C) 2005, Thomas Gleixner <tglx@linutronix.de>
- * Copyright(C) 2006, Hans J. Koch <hjk@linutronix.de>
+ * Copyright(C) 2006, Hans J. Koch <hjk@hansjkoch.de>
  * Copyright(C) 2006, Greg Kroah-Hartman <greg@kroah.com>
  *
  * Userspace IO
diff --git a/trunk/drivers/uio/uio_cif.c b/trunk/drivers/uio/uio_cif.c
index a8ea2f19a0cc..a84a451159ed 100644
--- a/trunk/drivers/uio/uio_cif.c
+++ b/trunk/drivers/uio/uio_cif.c
@@ -1,7 +1,7 @@
 /*
  * UIO Hilscher CIF card driver
  *
- * (C) 2007 Hans J. Koch <hjk@linutronix.de>
+ * (C) 2007 Hans J. Koch <hjk@hansjkoch.de>
  * Original code (C) 2005 Benedikt Spranger <b.spranger@linutronix.de>
  *
  * Licensed under GPL version 2 only.
diff --git a/trunk/drivers/uio/uio_netx.c b/trunk/drivers/uio/uio_netx.c
index 5a18e9f7b836..5ffdb483b015 100644
--- a/trunk/drivers/uio/uio_netx.c
+++ b/trunk/drivers/uio/uio_netx.c
@@ -2,7 +2,7 @@
  * UIO driver for Hilscher NetX based fieldbus cards (cifX, comX).
  * See http://www.hilscher.com for details.
  *
- * (C) 2007 Hans J. Koch <hjk@linutronix.de>
+ * (C) 2007 Hans J. Koch <hjk@hansjkoch.de>
  * (C) 2008 Manuel Traut <manut@linutronix.de>
  *
  * Licensed under GPL version 2 only.
diff --git a/trunk/include/linux/uio_driver.h b/trunk/include/linux/uio_driver.h
index d6188e5a52df..665517c05eaf 100644
--- a/trunk/include/linux/uio_driver.h
+++ b/trunk/include/linux/uio_driver.h
@@ -3,7 +3,7 @@
  *
  * Copyright(C) 2005, Benedikt Spranger <b.spranger@linutronix.de>
  * Copyright(C) 2005, Thomas Gleixner <tglx@linutronix.de>
- * Copyright(C) 2006, Hans J. Koch <hjk@linutronix.de>
+ * Copyright(C) 2006, Hans J. Koch <hjk@hansjkoch.de>
  * Copyright(C) 2006, Greg Kroah-Hartman <greg@kroah.com>
  *
  * Userspace IO driver.