diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-24 12:22:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-24 12:22:39 -0500 |
| commit | a7f4463e0300b5135c0f0caf7c34a0529405f986 (patch) | |
| tree | 8df5f13094778eff3c8653bcc249cd265378b80a /MAINTAINERS | |
| parent | c478f8786973d6d7552c652ddad3f6fd86b5af28 (diff) | |
| parent | 20f4d6c3a2a23c5d7d9cc7f42fbb943ca7a03d1f (diff) | |
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc6' into tracing/core
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0ad46148a17a..f1d45b975a1a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3340,8 +3340,8 @@ P: Jeremy Fitzhardinge | |||
| 3340 | M: jeremy@xensource.com | 3340 | M: jeremy@xensource.com |
| 3341 | P: Chris Wright | 3341 | P: Chris Wright |
| 3342 | M: chrisw@sous-sol.org | 3342 | M: chrisw@sous-sol.org |
| 3343 | P: Zachary Amsden | 3343 | P: Alok Kataria |
| 3344 | M: zach@vmware.com | 3344 | M: akataria@vmware.com |
| 3345 | P: Rusty Russell | 3345 | P: Rusty Russell |
| 3346 | M: rusty@rustcorp.com.au | 3346 | M: rusty@rustcorp.com.au |
| 3347 | L: virtualization@lists.osdl.org | 3347 | L: virtualization@lists.osdl.org |