aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2014-04-03 17:48:53 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-03 19:21:09 -0400
commit9e06f631ecef84a949a89765e0787c61d63c3f56 (patch)
treeafbdcd43a3c2097118030542cdbd7ca5c712d02d
parent8a72f57efa1b0a12502f152231e94c8254a5ecd9 (diff)
MAINTAINERS: remove Venkatesh from HPET, move to CREDITS
Seems he's gone off to bigger/better things. So long, etc... Signed-off-by: Joe Perches <joe@perches.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--CREDITS3
-rw-r--r--MAINTAINERS3
2 files changed, 4 insertions, 2 deletions
diff --git a/CREDITS b/CREDITS
index cef042453fa4..61eabf7ca376 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2711,6 +2711,9 @@ N: Greg Page
2711E: gpage@sovereign.org 2711E: gpage@sovereign.org
2712D: IPX development and support 2712D: IPX development and support
2713 2713
2714N: Venkatesh Pallipadi (Venki)
2715D: x86/HPET
2716
2714N: David Parsons 2717N: David Parsons
2715E: orc@pell.chi.il.us 2718E: orc@pell.chi.il.us
2716D: improved memory detection code. 2719D: improved memory detection code.
diff --git a/MAINTAINERS b/MAINTAINERS
index ad3b5a459ebc..2f2675493b3a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4155,8 +4155,7 @@ F: include/linux/hpet.h
4155F: include/uapi/linux/hpet.h 4155F: include/uapi/linux/hpet.h
4156 4156
4157HPET: x86 4157HPET: x86
4158M: "Venkatesh Pallipadi (Venki)" <venki@google.com> 4158S: Orphan
4159S: Maintained
4160F: arch/x86/kernel/hpet.c 4159F: arch/x86/kernel/hpet.c
4161F: arch/x86/include/asm/hpet.h 4160F: arch/x86/include/asm/hpet.h
4162 4161