diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-18 01:58:45 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-18 01:58:45 -0400 |
| commit | 03418c7efaa429dc7647ac93e3862e3fe1816873 (patch) | |
| tree | d5a101034139f846b700dfdf53eb6737ea6c4365 /MAINTAINERS | |
| parent | 4176935b58eeb636917e65a2c388e4607e36cce6 (diff) | |
| parent | ee568b25ee9e160b32d1aef73d8b2ee9c05d34db (diff) | |
Merge branches 'tracing/ftrace' and 'linus' into tracing/core
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a17f0b161e03..dd3c11c4c3d2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3882,6 +3882,15 @@ L: linux-ide@vger.kernel.org | |||
| 3882 | T: git kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git | 3882 | T: git kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git |
| 3883 | S: Supported | 3883 | S: Supported |
| 3884 | 3884 | ||
| 3885 | SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER | ||
| 3886 | P: Sathya Perla | ||
| 3887 | M: sathyap@serverengines.com | ||
| 3888 | P: Subbu Seetharaman | ||
| 3889 | M: subbus@serverengines.com | ||
| 3890 | L: netdev@vger.kernel.org | ||
| 3891 | W: http://www.serverengines.com | ||
| 3892 | S: Supported | ||
| 3893 | |||
| 3885 | SFC NETWORK DRIVER | 3894 | SFC NETWORK DRIVER |
| 3886 | P: Steve Hodgson | 3895 | P: Steve Hodgson |
| 3887 | P: Ben Hutchings | 3896 | P: Ben Hutchings |