diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-27 04:03:03 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-27 04:03:03 -0400 |
| commit | e40051d134f7ee95c8c1f7a3471e84eafc9ab326 (patch) | |
| tree | 88eb44e49a75721ae926665a2c42f08badac9d07 /MAINTAINERS | |
| parent | 42099d7a3941d4aaf853caac92b3ae76149fc6e7 (diff) | |
| parent | 2cc6d2bf3d6195fabcf0febc192c01f99519a8f3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/qlcnic/qlcnic_init.c
net/ipv4/ip_output.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 017bf493166e..3168d0cbd358 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1142,7 +1142,7 @@ ATLX ETHERNET DRIVERS | |||
| 1142 | M: Jay Cliburn <jcliburn@gmail.com> | 1142 | M: Jay Cliburn <jcliburn@gmail.com> |
| 1143 | M: Chris Snook <chris.snook@gmail.com> | 1143 | M: Chris Snook <chris.snook@gmail.com> |
| 1144 | M: Jie Yang <jie.yang@atheros.com> | 1144 | M: Jie Yang <jie.yang@atheros.com> |
| 1145 | L: atl1-devel@lists.sourceforge.net | 1145 | L: netdev@vger.kernel.org |
| 1146 | W: http://sourceforge.net/projects/atl1 | 1146 | W: http://sourceforge.net/projects/atl1 |
| 1147 | W: http://atl1.sourceforge.net | 1147 | W: http://atl1.sourceforge.net |
| 1148 | S: Maintained | 1148 | S: Maintained |