diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:24:32 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:24:32 +0200 |
commit | 5d641e7bbb8ed48f231bc902eecab2cc598f34a4 (patch) | |
tree | 1be4ef1941355af508cc203838560a50707851bc /MAINTAINERS | |
parent | 9ae76f5d8ab546660cf517bb63c64de51800955d (diff) | |
parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) |
Merge branch 'linus' into safe-poison-pointerstip-safe-poison-pointers-2008-06-25_10.24_Wed
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cd587eec9fa7..8f0ec46a7096 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4431,10 +4431,10 @@ M: johnpol@2ka.mipt.ru S: Maintained W83791D HARDWARE MONITORING DRIVER -P: Charles Spirakis -M: bezaur@gmail.com +P: Marc Hulsman +M: m.hulsman@tudelft.nl L: lm-sensors@lm-sensors.org -S: Odd Fixes +S: Maintained W83793 HARDWARE MONITORING DRIVER P: Rudolf Marek |