aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-20 12:20:59 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-20 12:20:59 -0400
commitf39d01be4c59a61a08d0cb53f615e7016b85d339 (patch)
tree6777590e3ff2ddf4df1d38444ba7d692cd463b7b /MAINTAINERS
parent54291263519ac2c9bdda68b23b02fef3808deed4 (diff)
parent7db82437cfcac4bdfe79a6323eb554fdfa271623 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (44 commits) vlynq: make whole Kconfig-menu dependant on architecture add descriptive comment for TIF_MEMDIE task flag declaration. EEPROM: max6875: Header file cleanup EEPROM: 93cx6: Header file cleanup EEPROM: Header file cleanup agp: use NULL instead of 0 when pointer is needed rtc-v3020: make bitfield unsigned PCI: make bitfield unsigned jbd2: use NULL instead of 0 when pointer is needed cciss: fix shadows sparse warning doc: inode uses a mutex instead of a semaphore. uml: i386: Avoid redefinition of NR_syscalls fix "seperate" typos in comments cocbalt_lcdfb: correct sections doc: Change urls for sparse Powerpc: wii: Fix typo in comment i2o: cleanup some exit paths Documentation/: it's -> its where appropriate UML: Fix compiler warning due to missing task_struct declaration UML: add kernel.h include to signal.c ...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS8
1 files changed, 2 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index de39882924d0..2f5510cc142d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2701,16 +2701,12 @@ F: Documentation/timers/hpet.txt
2701F: drivers/char/hpet.c 2701F: drivers/char/hpet.c
2702F: include/linux/hpet.h 2702F: include/linux/hpet.h
2703 2703
2704HPET: i386 2704HPET: x86
2705M: "Venkatesh Pallipadi (Venki)" <venkatesh.pallipadi@intel.com> 2705M: "Venkatesh Pallipadi (Venki)" <venki@google.com>
2706S: Maintained 2706S: Maintained
2707F: arch/x86/kernel/hpet.c 2707F: arch/x86/kernel/hpet.c
2708F: arch/x86/include/asm/hpet.h 2708F: arch/x86/include/asm/hpet.h
2709 2709
2710HPET: x86_64
2711M: Vojtech Pavlik <vojtech@suse.cz>
2712S: Maintained
2713
2714HPET: ACPI 2710HPET: ACPI
2715M: Bob Picco <bob.picco@hp.com> 2711M: Bob Picco <bob.picco@hp.com>
2716S: Maintained 2712S: Maintained