diff options
| author | Steve French <sfrench@us.ibm.com> | 2010-12-03 03:52:43 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-12-03 03:52:43 +0000 |
| commit | ebb27386ffd2fcd0fad141e0eee97b8070f94ee2 (patch) | |
| tree | 3c71ee87e8771ac0eed912729605dbaf3f39348c /drivers/uio/uio_netx.c | |
| parent | 6d20e8406f0942228a73000663c2b33f488103ea (diff) | |
| parent | 59e57c622c3502346e8f930421ebc482d639520c (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/uio/uio_netx.c')
| -rw-r--r-- | drivers/uio/uio_netx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/uio/uio_netx.c b/drivers/uio/uio_netx.c index 5a18e9f7b83..5ffdb483b01 100644 --- a/drivers/uio/uio_netx.c +++ b/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. |
