diff options
| author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-02-24 08:35:26 +0700 |
|---|---|---|
| committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-02-24 08:35:26 +0700 |
| commit | 6c5dadef809982e05b16ba7cf309e7c642a1b56a (patch) | |
| tree | 1524a508c2cdf116b160732d002179e7537b20a7 /MAINTAINERS | |
| parent | ade046f9db4d92795249a3e3ce2b8cebf6dce0c7 (diff) | |
| parent | 21d69845e411bfcee426070af5416ddfba350529 (diff) | |
| download | kernel_samsung_aries-6c5dadef809982e05b16ba7cf309e7c642a1b56a.zip kernel_samsung_aries-6c5dadef809982e05b16ba7cf309e7c642a1b56a.tar.gz kernel_samsung_aries-6c5dadef809982e05b16ba7cf309e7c642a1b56a.tar.bz2 | |
Merge 3.0.66
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c8c0874..9b893d7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2491,7 +2491,7 @@ S: Maintained F: drivers/net/eexpress.* ETHERNET BRIDGE -M: Stephen Hemminger <shemminger@linux-foundation.org> +M: Stephen Hemminger <stephen@networkplumber.org> L: bridge@lists.linux-foundation.org L: netdev@vger.kernel.org W: http://www.linuxfoundation.org/en/Net:Bridge @@ -4327,7 +4327,7 @@ S: Supported F: drivers/infiniband/hw/nes/ NETEM NETWORK EMULATOR -M: Stephen Hemminger <shemminger@linux-foundation.org> +M: Stephen Hemminger <stephen@networkplumber.org> L: netem@lists.linux-foundation.org S: Maintained F: net/sched/sch_netem.c @@ -5779,7 +5779,7 @@ S: Maintained F: drivers/usb/misc/sisusbvga/ SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS -M: Stephen Hemminger <shemminger@linux-foundation.org> +M: Stephen Hemminger <stephen@networkplumber.org> L: netdev@vger.kernel.org S: Maintained F: drivers/net/skge.* |