diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-20 05:35:57 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-20 05:35:57 -0500 |
| commit | 64b36ca7f408e0bd45487c8c28f168f11f3b6dcd (patch) | |
| tree | 0b8ed22d46d775f04d441e8c480c12ec297a005b /MAINTAINERS | |
| parent | 00a8bf859331e349713274825e6fbf20bf2ac15a (diff) | |
| parent | 402a917aca5daca69fcc91f43e6f1e6939cf393b (diff) | |
Merge branches 'tracing/function-graph-tracer' and 'linus' into tracing/core
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4c2e406fab61..0ad46148a17a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -692,6 +692,13 @@ M: kernel@wantstofly.org | |||
| 692 | L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) | 692 | L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) |
| 693 | S: Maintained | 693 | S: Maintained |
| 694 | 694 | ||
| 695 | ARM/NUVOTON W90X900 ARM ARCHITECTURE | ||
| 696 | P: Wan ZongShun | ||
| 697 | M: mcuos.com@gmail.com | ||
| 698 | L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) | ||
| 699 | W: http://www.mcuos.com | ||
| 700 | S: Maintained | ||
| 701 | |||
| 695 | ARPD SUPPORT | 702 | ARPD SUPPORT |
| 696 | P: Jonathan Layes | 703 | P: Jonathan Layes |
| 697 | L: netdev@vger.kernel.org | 704 | L: netdev@vger.kernel.org |