diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-14 13:37:34 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-14 13:37:34 +1100 |
| commit | 811496e899d0c8a1699691d707758feffac813bd (patch) | |
| tree | f46617d00fb875827e99b598fe022d6349794713 /MAINTAINERS | |
| parent | edb70042e046d6c8b50cd74eb0d4ef3f646a9094 (diff) | |
| parent | a2c8b6b9bc412196e4a0bfa1c6b33840f7f0a039 (diff) | |
Merge remote branch 'hwlat/for-linus'
Conflicts:
drivers/misc/Makefile
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index aabe819f2c40..115cebed03ca 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2386,6 +2386,15 @@ W: http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/ S: Maintained F: drivers/hwmon/hdaps.c +HARDWARE LATENCY DETECTOR +P: Jon Masters +M: jcm@jonmasters.org +W: http://www.kernel.org/pub/linux/kernel/people/jcm/hwlat_detector/ +S: Supported +L: linux-kernel@vger.kernel.org +F: Documentation/hwlat_detector.txt +F: drivers/misc/hwlat_detector.c + HYPERVISOR VIRTUAL CONSOLE DRIVER L: linuxppc-dev@ozlabs.org S: Odd Fixes |