Merge tag 'v3.10.77' into update

This is the 3.10.77 stable release

diff --cc Makefile
Simple merge

diff --cc arch/arm/include/asm/elf.h
Simple merge

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

diff --cc arch/x86/power/hibernate_32.c
Simple merge

diff --cc arch/x86/power/hibernate_64.c
Simple merge

diff --cc drivers/i2c/i2c-core.c
Simple merge

diff --cc drivers/mtd/ubi/attach.c
Simple merge

diff --cc drivers/mtd/ubi/cdev.c
Simple merge

diff --cc drivers/mtd/ubi/eba.c
Simple merge

diff --cc drivers/mtd/ubi/wl.c
index 890890d67bfea2434074be83547be271764ee9b6,c08254016fe8b34d495793de03ffdd589e894a00..f4d9fe8837ebd4a58ab8fda813e557276c1b03f0
--- 1/drivers/mtd/ubi/wl.c
--- 2/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@@ -1014,8 -998,8 +1014,13 @@@ int ubi_wl_put_fm_peb(struct ubi_devic
  static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk,
                                int cancel)
  {
++<<<<<<< HEAD
 +      int erase_e2=1, err, scrubbing = 0, torture = 0, protect = 0, erroneous = 0;
 +      int vol_id = -1, uninitialized_var(lnum);
++=======
+       int err, scrubbing = 0, torture = 0, protect = 0, erroneous = 0;
+       int vol_id = -1, lnum = -1;
++>>>>>>> v3.10.77
  #ifdef CONFIG_MTD_UBI_FASTMAP
        int anchor = wrk->anchor;
  #endif

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

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

diff --cc drivers/video/console/Kconfig
index 48fac1621a5965b8cc8fe735a0aeae43d78ef3e2,37e62c7b3273e8d4b5c3c8be1658504ebc5910ff..1eb53646129e6f1b0fdc445d09ffa92facb032b2
--- 1/drivers/video/console/Kconfig
--- 2/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@@ -4,10 -4,12 +4,13 @@@
  
  menu "Console display driver support"
  
 +if VT
  config VGA_CONSOLE
        bool "VGA text console" if EXPERT || !X86
-       depends on !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !SUPERH && !BLACKFIN && !AVR32 && !MN10300 && (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER)
+       depends on !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && \
+               !SUPERH && !BLACKFIN && !AVR32 && !MN10300 && !CRIS && \
+               (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && \
+               !ARM64
        default y
        help
          Saying Y here will allow you to use Linux in text mode through a

diff --cc fs/binfmt_elf.c
Simple merge

diff --cc include/linux/usb.h
Simple merge

diff --cc kernel/softirq.c
Simple merge

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

diff --cc net/ipv4/tcp_output.c
Simple merge