diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-11 09:40:18 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-11 09:40:18 +0100 |
| commit | e0cb4ebcd9e5b4ddd8216c20f54445c91b1fa4b9 (patch) | |
| tree | d1c3b22b7e9f02fb56927da530da09c6ee7ce0b9 /MAINTAINERS | |
| parent | a309720c876d7ad2e224bfd1982c92ae4364c82e (diff) | |
| parent | 45b86a96f17cb2900f291129b0e67287400e45b2 (diff) | |
| download | linux-e0cb4ebcd9e5b4ddd8216c20f54445c91b1fa4b9.tar.gz linux-e0cb4ebcd9e5b4ddd8216c20f54445c91b1fa4b9.tar.bz2 linux-e0cb4ebcd9e5b4ddd8216c20f54445c91b1fa4b9.zip | |
Merge branch 'tracing/urgent' into tracing/ftrace
Conflicts:
kernel/trace/trace.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d643e862b8e4..7e6a17e1de09 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -721,7 +721,7 @@ W: http://sourceforge.net/projects/acpi4asus W: http://xf.iksaif.net/acpi4asus S: Maintained -ASYNCHRONOUS TRANSFERS/TRANSFORMS API +ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API P: Dan Williams M: dan.j.williams@intel.com P: Maciej Sosnowski |