3.6.11.1 stable review patch. If anyone has any objections, please let me know. ------------------ From: Stephen Hemminger <stephen.hemminger@xxxxxxxxxx> [ Upstream commit adbbf69d1a54abf424e91875746a610dcc80017d ] I changed my email because the vyatta.com mail server is now redirected to brocade.com; and the Brocade mail system is not friendly to Linux desktop users. Signed-off-by: Stephen Hemminger <stephen@xxxxxxxxxxxxxxxxxx> Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx> --- MAINTAINERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 9a6c4da..61ed6f7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2697,7 +2697,7 @@ S: Maintained F: drivers/net/ethernet/i825xx/eexpress.* ETHERNET BRIDGE -M: Stephen Hemminger <shemminger@xxxxxxxxxx> +M: Stephen Hemminger <stephen@xxxxxxxxxxxxxxxxxx> L: bridge@xxxxxxxxxxxxxxxxxxxxxxxxxx L: netdev@xxxxxxxxxxxxxxx W: http://www.linuxfoundation.org/en/Net:Bridge @@ -4420,7 +4420,7 @@ S: Maintained MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2) M: Mirko Lindner <mlindner@xxxxxxxxxxx> -M: Stephen Hemminger <shemminger@xxxxxxxxxx> +M: Stephen Hemminger <stephen@xxxxxxxxxxxxxxxxxx> L: netdev@xxxxxxxxxxxxxxx S: Maintained F: drivers/net/ethernet/marvell/sk* @@ -4664,7 +4664,7 @@ S: Supported F: drivers/infiniband/hw/nes/ NETEM NETWORK EMULATOR -M: Stephen Hemminger <shemminger@xxxxxxxxxx> +M: Stephen Hemminger <stephen@xxxxxxxxxxxxxxxxxx> L: netem@xxxxxxxxxxxxxxxxxxxxxxxxxx S: Maintained F: net/sched/sch_netem.c -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html