diff options
| author | David S. Miller <davem@davemloft.net> | 2011-10-07 13:38:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-07 13:38:43 -0400 |
| commit | 88c5100c28b02c4b2b2c6f6fafbbd76d90f698b9 (patch) | |
| tree | 08c4399e0341f7eb0ccb24e15f2cab687275c2a4 /MAINTAINERS | |
| parent | 8083f0fc969d9b5353061a7a6f963405057e26b1 (diff) | |
| parent | 3ee72ca99288f1de95ec9c570e43f531c8799f06 (diff) | |
Merge branch 'master' of github.com:davem330/net
Conflicts:
net/batman-adv/soft-interface.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 65ca7eae6276..aac56f9bf88a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -6382,7 +6382,6 @@ S: Supported | |||
| 6382 | F: arch/arm/mach-tegra | 6382 | F: arch/arm/mach-tegra |
| 6383 | 6383 | ||
| 6384 | TEHUTI ETHERNET DRIVER | 6384 | TEHUTI ETHERNET DRIVER |
| 6385 | M: Alexander Indenbaum <baum@tehutinetworks.net> | ||
| 6386 | M: Andy Gospodarek <andy@greyhouse.net> | 6385 | M: Andy Gospodarek <andy@greyhouse.net> |
| 6387 | L: netdev@vger.kernel.org | 6386 | L: netdev@vger.kernel.org |
| 6388 | S: Supported | 6387 | S: Supported |