diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-08-29 09:08:51 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-29 09:08:51 +0200 |
| commit | b9a3acf46afdafc601947136f63e9dd228cd86e8 (patch) | |
| tree | 2b206b6d3c51f673c94fbcdf03df2a699e7110d2 /drivers/w1/slaves/w1_therm.c | |
| parent | sh: ecovec: add renesas_usbhs DMAEngine support (diff) | |
| parent | sh: fix the compile error in setup-sh7757.c (diff) | |
| download | linux-b9a3acf46afdafc601947136f63e9dd228cd86e8.tar.xz linux-b9a3acf46afdafc601947136f63e9dd228cd86e8.zip | |
Merge branch 'sh/stable-updates' into sh-latest
Diffstat (limited to 'drivers/w1/slaves/w1_therm.c')
| -rw-r--r-- | drivers/w1/slaves/w1_therm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c index 402928b135d1..a1ef9b5b38cf 100644 --- a/drivers/w1/slaves/w1_therm.c +++ b/drivers/w1/slaves/w1_therm.c @@ -1,7 +1,7 @@ /* * w1_therm.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 @@ -34,7 +34,7 @@ #include "../w1_family.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, temperature family."); /* Allow the strong pullup to be disabled, but default to enabled. |