Merge remote-tracking branch 'usb/usb-next'

Conflicts:
	include/linux/usb/usbnet.h

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/usb/ax88179_178a.c
Simple merge

diff --cc drivers/net/usb/usbnet.c
Simple merge

diff --cc drivers/usb/gadget/storage_common.c
Simple merge

diff --cc drivers/usb/host/fsl-mph-dr-of.c
index b8a18665b1805ad8609b97cbbce5e671cfbda202,cfbff7161828005c6ea3732f30e452563c238d9e..217d2f7e65555287ca183a1134b920d1e29cd953
--- 1/drivers/usb/host/fsl-mph-dr-of.c
--- 2/drivers/usb/host/fsl-mph-dr-of.c
+++ b/drivers/usb/host/fsl-mph-dr-of.c
@@@ -258,9 -258,8 +258,9 @@@ static int fsl_usb2_mph_dr_of_remove(st
  
  int fsl_usb2_mpc5121_init(struct platform_device *pdev)
  {
-       struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data;
+       struct fsl_usb2_platform_data *pdata = dev_get_platdata(&pdev->dev);
        struct clk *clk;
 +      int err;
        char clk_name[10];
        int base, clk_num;
  

diff --cc include/linux/usb/usbnet.h
index 8fbc008e183e33704ddbc0f8cc63c3cd69b5f753,2b47e6364e3697ff1fbd684b923da5cd6ec65e82..9cb2fe8ca944d5095043dd7b7ce71116a3fc21eb
--- 1/include/linux/usb/usbnet.h
--- 2/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@@ -34,7 -34,7 +34,8 @@@ struct usbnet 
        struct mutex            phy_mutex;
        unsigned char           suspend_count;
        unsigned char           pkt_cnt, pkt_err;
 +      unsigned short          rx_qlen, tx_qlen;
+       unsigned                can_dma_sg:1;
  
        /* i/o info: pipes etc */
        unsigned                in, out;