diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-24 18:22:39 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-24 18:22:39 +0100 |
| commit | a7f4463e0300b5135c0f0caf7c34a0529405f986 (patch) | |
| tree | 8df5f13094778eff3c8653bcc249cd265378b80a /MAINTAINERS | |
| parent | c478f8786973d6d7552c652ddad3f6fd86b5af28 (diff) | |
| parent | 20f4d6c3a2a23c5d7d9cc7f42fbb943ca7a03d1f (diff) | |
| download | linux-a7f4463e0300b5135c0f0caf7c34a0529405f986.tar.bz2 | |
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 M: jeremy@xensource.com P: Chris Wright M: chrisw@sous-sol.org -P: Zachary Amsden -M: zach@vmware.com +P: Alok Kataria +M: akataria@vmware.com P: Rusty Russell M: rusty@rustcorp.com.au L: virtualization@lists.osdl.org |