diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-15 23:37:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-15 23:37:09 +0200 |
| commit | 688a3d00d51e575e0eabefbadc985995cf176de5 (patch) | |
| tree | b04b2555805cdda9cda283aa1aa0fb031139dbe7 /MAINTAINERS | |
| parent | 846ce339175da49ca3d828b39faabca3151d1bd9 (diff) | |
| parent | dc57da3875f527b1cc195ea4ce5bd32e1e68433d (diff) | |
Merge branch 'linus' into auto-latest
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 40e67113c380..70eef8a9ae17 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -485,8 +485,8 @@ S: Maintained F: drivers/input/mouse/bcm5974.c APPLE SMC DRIVER -M: Nicolas Boichat <nicolas@boichat.ch> -L: mactel-linux-devel@lists.sourceforge.net +M: Henrik Rydberg <rydberg@euromail.se> +L: lm-sensors@lm-sensors.org S: Maintained F: drivers/hwmon/applesmc.c |