diff options
| -rw-r--r-- | MAINTAINERS | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 447560284996..9706a21edcbd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3118,6 +3118,7 @@ F: include/linux/hid* | |||
| 3118 | 3118 | ||
| 3119 | HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS | 3119 | HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS |
| 3120 | M: Thomas Gleixner <tglx@linutronix.de> | 3120 | M: Thomas Gleixner <tglx@linutronix.de> |
| 3121 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core | ||
| 3121 | S: Maintained | 3122 | S: Maintained |
| 3122 | F: Documentation/timers/ | 3123 | F: Documentation/timers/ |
| 3123 | F: kernel/hrtimer.c | 3124 | F: kernel/hrtimer.c |
| @@ -3627,7 +3628,7 @@ F: net/irda/ | |||
| 3627 | IRQ SUBSYSTEM | 3628 | IRQ SUBSYSTEM |
| 3628 | M: Thomas Gleixner <tglx@linutronix.de> | 3629 | M: Thomas Gleixner <tglx@linutronix.de> |
| 3629 | S: Maintained | 3630 | S: Maintained |
| 3630 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git irq/core | 3631 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core |
| 3631 | F: kernel/irq/ | 3632 | F: kernel/irq/ |
| 3632 | 3633 | ||
| 3633 | ISAPNP | 3634 | ISAPNP |
| @@ -4115,7 +4116,7 @@ F: drivers/hwmon/lm90.c | |||
| 4115 | LOCKDEP AND LOCKSTAT | 4116 | LOCKDEP AND LOCKSTAT |
| 4116 | M: Peter Zijlstra <peterz@infradead.org> | 4117 | M: Peter Zijlstra <peterz@infradead.org> |
| 4117 | M: Ingo Molnar <mingo@redhat.com> | 4118 | M: Ingo Molnar <mingo@redhat.com> |
| 4118 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep.git | 4119 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core/locking |
| 4119 | S: Maintained | 4120 | S: Maintained |
| 4120 | F: Documentation/lockdep*.txt | 4121 | F: Documentation/lockdep*.txt |
| 4121 | F: Documentation/lockstat.txt | 4122 | F: Documentation/lockstat.txt |
| @@ -5102,6 +5103,7 @@ M: Peter Zijlstra <a.p.zijlstra@chello.nl> | |||
| 5102 | M: Paul Mackerras <paulus@samba.org> | 5103 | M: Paul Mackerras <paulus@samba.org> |
| 5103 | M: Ingo Molnar <mingo@elte.hu> | 5104 | M: Ingo Molnar <mingo@elte.hu> |
| 5104 | M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> | 5105 | M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> |
| 5106 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core | ||
| 5105 | S: Supported | 5107 | S: Supported |
| 5106 | F: kernel/events/* | 5108 | F: kernel/events/* |
| 5107 | F: include/linux/perf_event.h | 5109 | F: include/linux/perf_event.h |
| @@ -5181,6 +5183,7 @@ F: drivers/scsi/pm8001/ | |||
| 5181 | 5183 | ||
| 5182 | POSIX CLOCKS and TIMERS | 5184 | POSIX CLOCKS and TIMERS |
| 5183 | M: Thomas Gleixner <tglx@linutronix.de> | 5185 | M: Thomas Gleixner <tglx@linutronix.de> |
| 5186 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core | ||
| 5184 | S: Supported | 5187 | S: Supported |
| 5185 | F: fs/timerfd.c | 5188 | F: fs/timerfd.c |
| 5186 | F: include/linux/timer* | 5189 | F: include/linux/timer* |
| @@ -5696,6 +5699,7 @@ F: drivers/dma/dw_dmac.c | |||
| 5696 | TIMEKEEPING, NTP | 5699 | TIMEKEEPING, NTP |
| 5697 | M: John Stultz <johnstul@us.ibm.com> | 5700 | M: John Stultz <johnstul@us.ibm.com> |
| 5698 | M: Thomas Gleixner <tglx@linutronix.de> | 5701 | M: Thomas Gleixner <tglx@linutronix.de> |
| 5702 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core | ||
| 5699 | S: Supported | 5703 | S: Supported |
| 5700 | F: include/linux/clocksource.h | 5704 | F: include/linux/clocksource.h |
| 5701 | F: include/linux/time.h | 5705 | F: include/linux/time.h |
| @@ -5720,6 +5724,7 @@ F: drivers/watchdog/sc1200wdt.c | |||
| 5720 | SCHEDULER | 5724 | SCHEDULER |
| 5721 | M: Ingo Molnar <mingo@elte.hu> | 5725 | M: Ingo Molnar <mingo@elte.hu> |
| 5722 | M: Peter Zijlstra <peterz@infradead.org> | 5726 | M: Peter Zijlstra <peterz@infradead.org> |
| 5727 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core | ||
| 5723 | S: Maintained | 5728 | S: Maintained |
| 5724 | F: kernel/sched* | 5729 | F: kernel/sched* |
| 5725 | F: include/linux/sched.h | 5730 | F: include/linux/sched.h |
| @@ -6647,7 +6652,7 @@ TRACING | |||
| 6647 | M: Steven Rostedt <rostedt@goodmis.org> | 6652 | M: Steven Rostedt <rostedt@goodmis.org> |
| 6648 | M: Frederic Weisbecker <fweisbec@gmail.com> | 6653 | M: Frederic Weisbecker <fweisbec@gmail.com> |
| 6649 | M: Ingo Molnar <mingo@redhat.com> | 6654 | M: Ingo Molnar <mingo@redhat.com> |
| 6650 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf/core | 6655 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core |
| 6651 | S: Maintained | 6656 | S: Maintained |
| 6652 | F: Documentation/trace/ftrace.txt | 6657 | F: Documentation/trace/ftrace.txt |
| 6653 | F: arch/*/*/*/ftrace.h | 6658 | F: arch/*/*/*/ftrace.h |
| @@ -7397,7 +7402,7 @@ M: Thomas Gleixner <tglx@linutronix.de> | |||
| 7397 | M: Ingo Molnar <mingo@redhat.com> | 7402 | M: Ingo Molnar <mingo@redhat.com> |
| 7398 | M: "H. Peter Anvin" <hpa@zytor.com> | 7403 | M: "H. Peter Anvin" <hpa@zytor.com> |
| 7399 | M: x86@kernel.org | 7404 | M: x86@kernel.org |
| 7400 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git | 7405 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core |
| 7401 | S: Maintained | 7406 | S: Maintained |
| 7402 | F: Documentation/x86/ | 7407 | F: Documentation/x86/ |
| 7403 | F: arch/x86/ | 7408 | F: arch/x86/ |
