diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2014-02-20 08:54:28 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-02-20 08:54:28 -0500 |
| commit | d4263348f796f29546f90802177865dd4379dd0a (patch) | |
| tree | adcbdaebae584eee2f32fab95e826e8e49eef385 /CREDITS | |
| parent | be873ac782f5ff5ee6675f83929f4fe6737eead2 (diff) | |
| parent | 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2 (diff) | |
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 | |||
| 823 | S: Germany | 823 | S: Germany |
| 824 | 824 | ||
| 825 | N: Jean Delvare | 825 | N: Jean Delvare |
| 826 | E: khali@linux-fr.org | 826 | E: jdelvare@suse.de |
| 827 | W: http://khali.linux-fr.org/ | 827 | W: http://jdelvare.nerim.net/ |
| 828 | D: Several hardware monitoring drivers | 828 | D: Several hardware monitoring drivers |
| 829 | S: France | 829 | S: France |
| 830 | 830 | ||