Merge tag 'v3.10.56' into update

This is the 3.10.56 stable release

diff --cc Makefile
Simple merge

diff --cc arch/arm/kernel/irq.c
Simple merge

diff --cc arch/arm64/kernel/process.c
Simple merge

diff --cc arch/arm64/kernel/ptrace.c
Simple merge

diff --cc arch/arm64/kernel/sys_compat.c
Simple merge

diff --cc block/genhd.c
Simple merge

diff --cc block/partition-generic.c
Simple merge

diff --cc drivers/hid/hid-magicmouse.c
Simple merge

diff --cc drivers/usb/core/hub.c
Simple merge

diff --cc drivers/usb/host/xhci-mem.c
Simple merge

diff --cc drivers/usb/host/xhci.c
Simple merge

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

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

diff --cc drivers/usb/storage/unusual_devs.h
Simple merge

diff --cc fs/buffer.c
Simple merge

diff --cc fs/nfs/nfs4proc.c
Simple merge

diff --cc kernel/events/core.c
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/power/main.c
Simple merge

diff --cc kernel/power/power.h
Simple merge

diff --cc kernel/power/suspend.c
index 19951c09ba856008afa8fbe8754beda37c2becdc,903c517b14da5c4719d6b848645a505bd31913bb..b554a91fdee22c0b6556a5b324e70952bba73466
--- 1/kernel/power/suspend.c
--- 2/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@@ -30,14 -29,10 +30,13 @@@
  
  #include "power.h"
  
- const char *const pm_states[PM_SUSPEND_MAX] = {
- //<20130327> <marc.huang> merge from android kernel 3.0 - add [PM_SUSPEND_ON] into pm_states
+ struct pm_sleep_state pm_states[PM_SUSPEND_MAX] = {
 +#ifdef CONFIG_EARLYSUSPEND
-       [PM_SUSPEND_ON]         = "on",
++      [PM_SUSPEND_ON]         = { .label = "on", },
 +#endif
-       [PM_SUSPEND_FREEZE]     = "freeze",
-       [PM_SUSPEND_STANDBY]    = "standby",
-       [PM_SUSPEND_MEM]        = "mem",
+       [PM_SUSPEND_FREEZE] = { .label = "freeze", .state = PM_SUSPEND_FREEZE },
+       [PM_SUSPEND_STANDBY] = { .label = "standby", },
+       [PM_SUSPEND_MEM] = { .label = "mem", },
  };
  
  static const struct platform_suspend_ops *suspend_ops;
@@@ -345,16 -334,10 +344,16 @@@ int enter_state(suspend_state_t state
                freeze_begin();
  
        printk(KERN_INFO "PM: Syncing filesystems ... ");
 +      #if 1
        sys_sync();
 +      #else /* sys_sync WQ ver2.0 use */
 +    //[MTK]
 +    suspend_syssync_enqueue();
 +    suspend_check_sys_sync_done();
 +  #endif
        printk("done.\n");
  
-       pr_debug("PM: Preparing system for %s sleep\n", pm_states[state]);
+       pr_debug("PM: Preparing system for %s sleep\n", pm_states[state].label);
        error = suspend_prepare(state);
        if (error)
                goto Unlock;

diff --cc kernel/time/alarmtimer.c
Simple merge

diff --cc kernel/trace/ring_buffer.c
Simple merge

diff --cc mm/oom_kill.c
Simple merge

diff --cc mm/shmem.c
Simple merge

diff --cc mm/util.c
Simple merge

diff --cc net/netfilter/nf_conntrack_proto_tcp.c
Simple merge

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

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