diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-15 00:02:28 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-15 00:02:28 +0100 |
| commit | 1db3706b05b11abcf2673ffbed5ad43b4c90ed11 (patch) | |
| tree | 09fa867d9d9db6ed475eaa889da143603441e1a6 /drivers/w1/w1.c | |
| parent | ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893 (diff) | |
| parent | 63d15148b6058ab0037343390e8918503ed81968 (diff) | |
| download | linux-1db3706b05b11abcf2673ffbed5ad43b4c90ed11.tar.gz | |
Merge branch 'zImage_DTB_append' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'drivers/w1/w1.c')
| -rw-r--r-- | drivers/w1/w1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c index 6c136c19e982..c37497823851 100644 --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c @@ -1,7 +1,7 @@ /* * w1.c * - * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru> + * Copyright (c) 2004 Evgeniy Polyakov <zbr@ioremap.net> * * * This program is free software; you can redistribute it and/or modify @@ -42,7 +42,7 @@ #include "w1_netlink.h" MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>"); +MODULE_AUTHOR("Evgeniy Polyakov <zbr@ioremap.net>"); MODULE_DESCRIPTION("Driver for 1-wire Dallas network protocol."); static int w1_timeout = 10; |