diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-03-28 14:40:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-28 14:40:06 -0400 |
| commit | 630a216da662ba4197e330118fc55d772a2d7ec9 (patch) | |
| tree | ddadafda9ba834e74e7f882d761900e08bb1ca1c /MAINTAINERS | |
| parent | 91c5746425aed8f7188a351f1224a26aa232e4b3 (diff) | |
| parent | 2e1253d640eb7f8707d2591c93097c1e9f9c71d5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 72b08438d536..457ff5c52396 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -5059,9 +5059,8 @@ S: Maintained | |||
| 5059 | F: drivers/net/ethernet/marvell/sk* | 5059 | F: drivers/net/ethernet/marvell/sk* |
| 5060 | 5060 | ||
| 5061 | MARVELL LIBERTAS WIRELESS DRIVER | 5061 | MARVELL LIBERTAS WIRELESS DRIVER |
| 5062 | M: Dan Williams <dcbw@redhat.com> | ||
| 5063 | L: libertas-dev@lists.infradead.org | 5062 | L: libertas-dev@lists.infradead.org |
| 5064 | S: Maintained | 5063 | S: Orphan |
| 5065 | F: drivers/net/wireless/libertas/ | 5064 | F: drivers/net/wireless/libertas/ |
| 5066 | 5065 | ||
| 5067 | MARVELL MV643XX ETHERNET DRIVER | 5066 | MARVELL MV643XX ETHERNET DRIVER |