diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-21 14:42:20 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-21 14:42:20 -0400 |
| commit | b876d08f816527af257e13d89fb0d3b4b849223c (patch) | |
| tree | 40569f568230f918ca55f04b355e251747f913ed /MAINTAINERS | |
| parent | b364776ad1208a71f0c53578c84619a395412a8d (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/pci/dmar.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 22303e5fe4ce..6d51f00dcdc0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1198,7 +1198,7 @@ S: Maintained | |||
| 1198 | 1198 | ||
| 1199 | CPU FREQUENCY DRIVERS | 1199 | CPU FREQUENCY DRIVERS |
| 1200 | P: Dave Jones | 1200 | P: Dave Jones |
| 1201 | M: davej@codemonkey.org.uk | 1201 | M: davej@redhat.com |
| 1202 | L: cpufreq@vger.kernel.org | 1202 | L: cpufreq@vger.kernel.org |
| 1203 | W: http://www.codemonkey.org.uk/projects/cpufreq/ | 1203 | W: http://www.codemonkey.org.uk/projects/cpufreq/ |
| 1204 | T: git kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git | 1204 | T: git kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git |