diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-17 12:27:22 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-17 12:27:22 -0800 |
| commit | b4aa9e05a61b845541fa6f5b1d246976922601f0 (patch) | |
| tree | ca94478c3df281ab76a3399f5ba6341ade3f5791 /MAINTAINERS | |
| parent | 1dc0f3c54ce1df957f99c17b145488fd03eb1a59 (diff) | |
| parent | 4b8fe66300acb2fba8b16d62606e0d30204022fc (diff) | |
| download | linux-stable-b4aa9e05a61b845541fa6f5b1d246976922601f0.tar.gz linux-stable-b4aa9e05a61b845541fa6f5b1d246976922601f0.tar.bz2 linux-stable-b4aa9e05a61b845541fa6f5b1d246976922601f0.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x.h
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/vhost/vhost.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2a5e60fb3b5d..f5630a5b3f49 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5943,7 +5943,6 @@ F: include/linux/tty.h TULIP NETWORK DRIVERS M: Grant Grundler <grundler@parisc-linux.org> -M: Kyle McMartin <kyle@mcmartin.ca> L: netdev@vger.kernel.org S: Maintained F: drivers/net/tulip/ |