Merge tag 'v3.10.63' into linux-linaro-lsk
authorAlex Shi <alex.shi@linaro.org>
Wed, 17 Dec 2014 07:10:27 +0000 (15:10 +0800)
committerAlex Shi <alex.shi@linaro.org>
Wed, 17 Dec 2014 07:10:27 +0000 (15:10 +0800)
 This is the 3.10.63 stable release

1  2 
arch/x86/kvm/vmx.c
mm/memory.c

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