Merge tag 'v3.10.77' into linux-linaro-lsk
authorAlex Shi <alex.shi@linaro.org>
Tue, 12 May 2015 06:53:40 +0000 (14:53 +0800)
committerAlex Shi <alex.shi@linaro.org>
Tue, 12 May 2015 06:53:40 +0000 (14:53 +0800)
 This is the 3.10.77 stable release

 Conflicts:
drivers/video/console/Kconfig
scripts/kconfig/menu.c

1  2 
arch/arm/include/asm/elf.h
drivers/i2c/i2c-core.c
include/linux/mm.h
mm/memory.c
virt/kvm/kvm_main.c

Simple merge
Simple merge
Simple merge
diff --cc mm/memory.c
Simple merge
Simple merge