diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-02 12:58:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-02 12:58:36 -0800 |
| commit | 8733cb29d60fd2ca6c1f50f69f9b90fbfcd1879b (patch) | |
| tree | e6bef80539d3ada338f3f72733253b995df7e5c7 /drivers/uio/uio_netx.c | |
| parent | eed5ee1a3ab3020168cd67fdde2500452b0628c9 (diff) | |
| parent | 318af55ddd38bdaaa2b57f5c3bd394f3ce3a2610 (diff) | |
| download | linux-8733cb29d60fd2ca6c1f50f69f9b90fbfcd1879b.tar.gz | |
Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
uio: Change mail address of Hans J. Koch
driver core: prune docs about device_interface
driver core: the development tree has switched to git
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 5a18e9f7b836..5ffdb483b015 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. |