diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 05:29:11 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 05:29:11 -0400 |
| commit | 1e74f9cbbba5348a6c58988cce0f19d6ef887cc8 (patch) | |
| tree | 47fcfdba6a17a02cf6745146ebb2ae435405ab1a /MAINTAINERS | |
| parent | 31a72bce0bd6f3e0114009288bccbc96376eeeca (diff) | |
| parent | 481c5346d0981940ee63037eb53e4e37b0735c10 (diff) | |
Merge branch 'linus' into core/rcu
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 | |||
| 4431 | S: Maintained | 4431 | S: Maintained |
| 4432 | 4432 | ||
| 4433 | W83791D HARDWARE MONITORING DRIVER | 4433 | W83791D HARDWARE MONITORING DRIVER |
| 4434 | P: Charles Spirakis | 4434 | P: Marc Hulsman |
| 4435 | M: bezaur@gmail.com | 4435 | M: m.hulsman@tudelft.nl |
| 4436 | L: lm-sensors@lm-sensors.org | 4436 | L: lm-sensors@lm-sensors.org |
| 4437 | S: Odd Fixes | 4437 | S: Maintained |
| 4438 | 4438 | ||
| 4439 | W83793 HARDWARE MONITORING DRIVER | 4439 | W83793 HARDWARE MONITORING DRIVER |
| 4440 | P: Rudolf Marek | 4440 | P: Rudolf Marek |