diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2014-02-20 14:54:28 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-02-20 14:54:28 +0100 |
| commit | d4263348f796f29546f90802177865dd4379dd0a (patch) | |
| tree | adcbdaebae584eee2f32fab95e826e8e49eef385 /CREDITS | |
| parent | be873ac782f5ff5ee6675f83929f4fe6737eead2 (diff) | |
| parent | 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2 (diff) | |
| download | linux-next-d4263348f796f29546f90802177865dd4379dd0a.tar.gz | |
Merge branch 'master' into for-next
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -823,8 +823,8 @@ S: D-69231 Rauenberg S: Germany N: Jean Delvare -E: khali@linux-fr.org -W: http://khali.linux-fr.org/ +E: jdelvare@suse.de +W: http://jdelvare.nerim.net/ D: Several hardware monitoring drivers S: France |