projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-3.14' of git://openrisc.net/~jonas/linux
[cascardo/linux.git]
/
drivers
/
hwmon
/
nct6775.c
diff --git
a/drivers/hwmon/nct6775.c
b/drivers/hwmon/nct6775.c
index
8686e96
..
38d5a63
100644
(file)
--- a/
drivers/hwmon/nct6775.c
+++ b/
drivers/hwmon/nct6775.c
@@
-5,7
+5,7
@@
* Copyright (C) 2012 Guenter Roeck <linux@roeck-us.net>
*
* Derived from w83627ehf driver
* Copyright (C) 2012 Guenter Roeck <linux@roeck-us.net>
*
* Derived from w83627ehf driver
- * Copyright (C) 2005-2012 Jean Delvare <
khali@linux-fr.org
>
+ * Copyright (C) 2005-2012 Jean Delvare <
jdelvare@suse.de
>
* Copyright (C) 2006 Yuan Mu (Winbond),
* Rudolf Marek <r.marek@assembler.cz>
* David Hubbard <david.c.hubbard@gmail.com>
* Copyright (C) 2006 Yuan Mu (Winbond),
* Rudolf Marek <r.marek@assembler.cz>
* David Hubbard <david.c.hubbard@gmail.com>