diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-05 02:14:15 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-05 02:14:15 -0400 |
| commit | 478c6a43fcbc6c11609f8cee7c7b57223907754f (patch) | |
| tree | a7f7952099da60d33032aed6de9c0c56c9f8779e /drivers/hwmon/f75375s.c | |
| parent | 8a3f257c704e02aee9869decd069a806b45be3f1 (diff) | |
| parent | 6bb597507f9839b13498781e481f5458aea33620 (diff) | |
Merge branch 'linus' into release
Conflicts:
arch/x86/kernel/cpu/cpufreq/longhaul.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/hwmon/f75375s.c')
| -rw-r--r-- | drivers/hwmon/f75375s.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c index 18a1ba888165..e2107e533ede 100644 --- a/drivers/hwmon/f75375s.c +++ b/drivers/hwmon/f75375s.c @@ -1,7 +1,7 @@ /* * f75375s.c - driver for the Fintek F75375/SP and F75373 * hardware monitoring features - * Copyright (C) 2006-2007 Riku Voipio <riku.voipio@movial.fi> + * Copyright (C) 2006-2007 Riku Voipio * * Datasheets available at: * @@ -721,7 +721,7 @@ static void __exit sensors_f75375_exit(void) i2c_del_driver(&f75375_driver); } -MODULE_AUTHOR("Riku Voipio <riku.voipio@movial.fi>"); +MODULE_AUTHOR("Riku Voipio"); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("F75373/F75375 hardware monitoring driver"); |