Merge tag 'v3.10.97' into update

This is the 3.10.97 stable release

diff --cc Makefile
Simple merge

diff --cc drivers/mtd/mtdpart.c
Simple merge

diff --cc drivers/usb/host/xhci.c
index 1316a03c1a43097ed6ee88750e230aa01ae9c1c2,9dd6fa3a1260456329d10d07cbd51ead4ce96ffa..10a9804a08c2962ca8c78e660f1efe7083701f16
--- 1/drivers/usb/host/xhci.c
--- 2/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@@ -5156,15 -4819,7 +5159,12 @@@ static int __init xhci_hcd_init(void
        /* xhci_run_regs has eight fields and embeds 128 xhci_intr_regs */
        BUILD_BUG_ON(sizeof(struct xhci_run_regs) != (8+8*128)*32/8);
  
-       if (usb_disabled())
-               return -ENODEV;
- 
        return 0;
 +
 +#ifdef CONFIG_MTK_XHCI
 +unreg_plat:
 +    xhci_unregister_plat();
 +#endif
  unreg_pci:
        xhci_unregister_pci();
        return retval;

diff --cc drivers/usb/serial/option.c
Simple merge

diff --cc fs/binfmt_elf.c
Simple merge

diff --cc fs/ext4/ext4.h
Simple merge

diff --cc kernel/signal.c
Simple merge

diff --cc sound/core/compress_offload.c
Simple merge

diff --cc sound/core/timer.c
Simple merge