Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4
authorAlex Shi <alex.shi@linaro.org>
Wed, 5 Oct 2016 11:21:50 +0000 (13:21 +0200)
committerAlex Shi <alex.shi@linaro.org>
Wed, 5 Oct 2016 11:21:50 +0000 (13:21 +0200)
commit10fd238c91a8dd2fb9c9bce99eb4d357254fb3c6
tree7c24d0606e1183d104bd183ae5578a958e00fa34
parente4f4f9e5b9ec7278b8384ea000c79325846a3872
parent8d5e93bb8c9c48ee5948f6b1aff0e895381f09e6
Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4

Conflicts:
resovle the conflict on pax_copy for
arch/ia64/include/asm/uaccess.h
arch/powerpc/include/asm/uaccess.h
arch/sparc/include/asm/uaccess_32.h
arch/arm/kvm/arm.c
arch/arm64/include/asm/spinlock.h
arch/ia64/include/asm/uaccess.h
arch/parisc/include/asm/uaccess.h
arch/powerpc/include/asm/uaccess.h
arch/sparc/include/asm/uaccess_32.h
arch/x86/include/asm/uaccess.h