diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2013-02-18 09:51:42 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-02-18 09:51:42 -0500 |
| commit | c38c3220ae1bb4e8575126e66e05fc42fe51a0bf (patch) | |
| tree | 267fafa8ce15b94a74cecf3d076931d6e8a35acd /MAINTAINERS | |
| parent | 996b2646e323516854406a4fa82f2411b082df88 (diff) | |
| parent | 72a274602416d7c5dc04641832af8d0710a548dd (diff) | |
Merge tag 'v3.4.31' into v3.4-rt
This is the 3.4.31 stable release
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 148dc9822605..a6aed98feb5c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2627,7 +2627,7 @@ S: Maintained F: drivers/net/ethernet/i825xx/eexpress.* ETHERNET BRIDGE -M: Stephen Hemminger <shemminger@vyatta.com> +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 @@ -4321,7 +4321,7 @@ S: Maintained MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2) M: Mirko Lindner <mlindner@marvell.com> -M: Stephen Hemminger <shemminger@vyatta.com> +M: Stephen Hemminger <stephen@networkplumber.org> L: netdev@vger.kernel.org S: Maintained F: drivers/net/ethernet/marvell/sk* @@ -4572,7 +4572,7 @@ S: Supported F: drivers/infiniband/hw/nes/ NETEM NETWORK EMULATOR -M: Stephen Hemminger <shemminger@vyatta.com> +M: Stephen Hemminger <stephen@networkplumber.org> L: netem@lists.linux-foundation.org S: Maintained F: net/sched/sch_netem.c |