Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
authorAlex Shi <alex.shi@linaro.org>
Thu, 13 Apr 2017 05:07:03 +0000 (13:07 +0800)
committerAlex Shi <alex.shi@linaro.org>
Thu, 13 Apr 2017 05:07:03 +0000 (13:07 +0800)
commit64fb55641f2f70959dddb122595b418a9c3c9187
tree75d4c3ae15afda455671c40d0268a23d4b0d5ad5
parent9221207894a7a76936bf67c35d81057ea9cd97fa
parent4f380dc2632d4bbb183b4574bf810e198002cf6b
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

Conflicts:
arch/arm64/Kconfig: keep ARCH_MMAP_RND_BITS_MIN etc config
Makefile
arch/arm64/Kconfig
drivers/staging/android/ashmem.c
mm/mempolicy.c