diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-14 05:37:46 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-14 05:37:46 -0400 |
| commit | d59fdcf2ac501de99c3dfb452af5e254d4342886 (patch) | |
| tree | ad5e2efd6f8aacf2a08b1ed8a54ddf96642e83f3 /MAINTAINERS | |
| parent | 2387ce57a8167490d3b34a7e1ffa9a64a1a76244 (diff) | |
| parent | bce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff) | |
Merge commit 'v2.6.26' into x86/core
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c94d038cea3..1528e58b540 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3088,8 +3088,8 @@ L: linux-scsi@vger.kernel.org | |||
| 3088 | S: Maintained | 3088 | S: Maintained |
| 3089 | 3089 | ||
| 3090 | OPROFILE | 3090 | OPROFILE |
| 3091 | P: Philippe Elie | 3091 | P: Robert Richter |
| 3092 | M: phil.el@wanadoo.fr | 3092 | M: robert.richter@amd.com |
| 3093 | L: oprofile-list@lists.sf.net | 3093 | L: oprofile-list@lists.sf.net |
| 3094 | S: Maintained | 3094 | S: Maintained |
| 3095 | 3095 | ||