diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-19 03:21:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-19 03:21:33 -0400 |
| commit | e1943424e43974f85b82bb31eaf832823bf49ce7 (patch) | |
| tree | 00a2dda7454ba186c0be4bfb8d08b7f74c3cd98c /MAINTAINERS | |
| parent | 88230fd586b4ccc5ffe6d6c2df8cdc495e89ad83 (diff) | |
| parent | 0553c891fabd287726b41076cfd03fe7e5ab596f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x_ethtool.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e1b056333b57..b5266ad50167 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -151,6 +151,7 @@ S: Maintained | |||
| 151 | F: drivers/net/hamradio/6pack.c | 151 | F: drivers/net/hamradio/6pack.c |
| 152 | 152 | ||
| 153 | 8169 10/100/1000 GIGABIT ETHERNET DRIVER | 153 | 8169 10/100/1000 GIGABIT ETHERNET DRIVER |
| 154 | M: Realtek linux nic maintainers <nic_swsd@realtek.com> | ||
| 154 | M: Francois Romieu <romieu@fr.zoreil.com> | 155 | M: Francois Romieu <romieu@fr.zoreil.com> |
| 155 | L: netdev@vger.kernel.org | 156 | L: netdev@vger.kernel.org |
| 156 | S: Maintained | 157 | S: Maintained |