diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
| commit | 9eeda9abd1faf489f3df9a1f557975f4c8650363 (patch) | |
| tree | 3e0a58e25b776cfbee193195460324dccb1886c7 /MAINTAINERS | |
| parent | 61c9eaf90081cbe6dc4f389e0056bff76eca19ec (diff) | |
| parent | 4bab0ea1d42dd1927af9df6fbf0003fc00617c50 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath5k/base.c
net/8021q/vlan_core.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 129117fe6490..ca96939b7969 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -721,7 +721,7 @@ W: http://sourceforge.net/projects/acpi4asus | |||
| 721 | W: http://xf.iksaif.net/acpi4asus | 721 | W: http://xf.iksaif.net/acpi4asus |
| 722 | S: Maintained | 722 | S: Maintained |
| 723 | 723 | ||
| 724 | ASYNCHRONOUS TRANSFERS/TRANSFORMS API | 724 | ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API |
| 725 | P: Dan Williams | 725 | P: Dan Williams |
| 726 | M: dan.j.williams@intel.com | 726 | M: dan.j.williams@intel.com |
| 727 | P: Maciej Sosnowski | 727 | P: Maciej Sosnowski |