Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/3com/3c59x.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bcmsysport.c
Simple merge

diff --cc drivers/net/ethernet/brocade/bna/bna_tx_rx.c
Simple merge

diff --cc drivers/net/hyperv/netvsc.c
Simple merge

diff --cc drivers/net/team/team.c
Simple merge

diff --cc drivers/net/usb/r8152.c
index 6532620,5ee7582..5cfd414
--- 1/drivers/net/usb/r8152.c
--- 2/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@@ -990,40 -1022,11 +995,42 @@@ static int rtl8152_set_mac_address(stru
        pla_ocp_write(tp, PLA_IDR, BYTE_EN_SIX_BYTES, 8, addr->sa_data);
        ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR, CRWECR_NORAML);
  
-       return 0;
+       usb_autopm_put_interface(tp->intf);
+ out1:
+       return ret;
  }
  
 +static int set_ethernet_addr(struct r8152 *tp)
 +{
 +      struct net_device *dev = tp->netdev;
 +      struct sockaddr sa;
 +      int ret;
 +
 +      if (tp->version == RTL_VER_01)
 +              ret = pla_ocp_read(tp, PLA_IDR, 8, sa.sa_data);
 +      else
 +              ret = pla_ocp_read(tp, PLA_BACKUP, 8, sa.sa_data);
 +
 +      if (ret < 0) {
 +              netif_err(tp, probe, dev, "Get ether addr fail\n");
 +      } else if (!is_valid_ether_addr(sa.sa_data)) {
 +              netif_err(tp, probe, dev, "Invalid ether addr %pM\n",
 +                        sa.sa_data);
 +              eth_hw_addr_random(dev);
 +              ether_addr_copy(sa.sa_data, dev->dev_addr);
 +              ret = rtl8152_set_mac_address(dev, &sa);
 +              netif_info(tp, probe, dev, "Random ether addr %pM\n",
 +                         sa.sa_data);
 +      } else {
 +              if (tp->version == RTL_VER_01)
 +                      ether_addr_copy(dev->dev_addr, sa.sa_data);
 +              else
 +                      ret = rtl8152_set_mac_address(dev, &sa);
 +      }
 +
 +      return ret;
 +}
 +
  static void read_bulk_callback(struct urb *urb)
  {
        struct net_device *netdev;

diff --cc net/bridge/br_netfilter.c
Simple merge

diff --cc net/bridge/br_private.h
Simple merge

diff --cc net/ipv6/ip6_gre.c
Simple merge

diff --cc net/sched/cls_api.c
Simple merge

diff --cc net/sched/ematch.c
Simple merge