Merge branch 'stable-3.2' into pandora-3.2

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

diff --cc drivers/usb/musb/musb_core.c
index 9231aa6,fb05cac..fe1d5c5
--- 1/drivers/usb/musb/musb_core.c
--- 2/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@@ -167,16 -162,10 +167,15 @@@ static int musb_ulpi_read(struct otg_tr
        r &= ~MUSB_ULPI_REG_CMPLT;
        musb_writeb(addr, MUSB_ULPI_REG_CONTROL, r);
  
 -      return musb_readb(addr, MUSB_ULPI_REG_DATA);
 +      ret = musb_readb(addr, MUSB_ULPI_REG_DATA);
 +
 +out:
 +      pm_runtime_put(otg->io_dev);
 +
 +      return ret;
  }
  
- static int musb_ulpi_write(struct otg_transceiver *otg,
-               u32 offset, u32 data)
+ static int musb_ulpi_write(struct otg_transceiver *otg, u32 val, u32 reg)
  {
        void __iomem *addr = otg->io_priv;
        int     i = 0;

diff --cc fs/cifs/connect.c
Simple merge

diff --cc fs/splice.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc mm/hugetlb.c
Simple merge

diff --cc mm/memory_hotplug.c
Simple merge

diff --cc mm/vmstat.c
Simple merge