Merge tag 'v3.8.1' into connectivity-linux-3.8.y

This is the 3.8.1 stable release

* tag 'v3.8.1': (155 commits)
  Linux 3.8.1
  drm/nv50/devinit: reverse the logic for running encoder init scripts
  drm/nouveau/bios: store a type/mask hash in parsed dcb data
  drm/nouveau/bios: parse external transmitter type if off-chip
  usb: musb: ux500: use clk_prepare_enable and clk_disable_unprepare
  usb: musb: fix dependency on transceiver driver
  usb: musb: core: fix failure path
  USB: usb-storage: unusual_devs update for Super TOP SATA bridge
  USB: storage: properly handle the endian issues of idProduct
  USB: ehci-omap: Fix autoloading of module
  USB: option: add Huawei "ACM" devices using protocol = vendor
  USB: option: add Yota / Megafon M100-1 4g modem
  USB: option: add and update Alcatel modems
  dca: check against empty dca_domains list before unregister provider
  dma: sh: Don't use ENODEV for failing slave lookup
  gpio: em: Use irq_domain_add_simple() to fix runtime error
  USB: ehci-omap: Don't free gpios that we didn't request
  mac80211: always unblock CSA queue stop when disconnecting
  vlan: adjust vlan_set_encap_proto() for its callers
  sock_diag: Fix out-of-bounds access to sock_diag_handlers[]
  ...

Conflicts:
	drivers/usb/host/ehci-omap.c

diff --cc drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
Simple merge

diff --cc drivers/net/wireless/rtlwifi/usb.c
Simple merge

diff --cc drivers/usb/musb/omap2430.c
index 6a956559904c27f4d4099c91a7f34175b766752f,d7772856bf4af6fb2f00dc2002df188f5f306739..9215ae3da9dcccf3fdbdbb4e6d9b92df2c89d7ae
--- 1/drivers/usb/musb/omap2430.c
--- 2/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@@ -345,15 -366,10 +345,15 @@@ static int omap2430_musb_init(struct mu
         * up through ULPI.  TWL4030-family PMICs include one,
         * which needs a driver, drivers aren't always needed.
         */
 -      musb->xceiv = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
 +      if (dev->parent->of_node)
 +              musb->xceiv = devm_usb_get_phy_by_phandle(dev->parent,
 +                  "usb-phy", 0);
 +      else
 +              musb->xceiv = devm_usb_get_phy_dev(dev, 0);
 +
        if (IS_ERR_OR_NULL(musb->xceiv)) {
                pr_err("HS USB OTG: no transceiver configured\n");
-               return -ENODEV;
+               return -EPROBE_DEFER;
        }
  
        musb->isr = omap2430_musb_interrupt;

diff --cc net/mac80211/mlme.c
Simple merge