diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-02-04 05:03:03 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2013-02-04 05:03:03 -0500 |
| commit | 90889a635a9b5488624bccce3ff6b2eec68c007b (patch) | |
| tree | 8ddde1e04060bd65ca2aafb09b38066cb7d69b4d /MAINTAINERS | |
| parent | a9037430c6c784165a940a90bcd29f886834c8e7 (diff) | |
| parent | 6f16eebe1ff82176339a0439c98ebec9768b0ee2 (diff) | |
Merge branch 'fortglx/3.9/time' of git://git.linaro.org/people/jstultz/linux into timers/core
Trivial conflict in arch/x86/Kconfig
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 212c255b9347..f5bda78792d9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -6598,7 +6598,7 @@ F: drivers/dma/dw_dmac_regs.h | |||
| 6598 | F: drivers/dma/dw_dmac.c | 6598 | F: drivers/dma/dw_dmac.c |
| 6599 | 6599 | ||
| 6600 | TIMEKEEPING, NTP | 6600 | TIMEKEEPING, NTP |
| 6601 | M: John Stultz <johnstul@us.ibm.com> | 6601 | M: John Stultz <john.stultz@linaro.org> |
| 6602 | M: Thomas Gleixner <tglx@linutronix.de> | 6602 | M: Thomas Gleixner <tglx@linutronix.de> |
| 6603 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core | 6603 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core |
| 6604 | S: Supported | 6604 | S: Supported |