Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
authorAlex Shi <alex.shi@linaro.org>
Thu, 12 May 2016 04:20:40 +0000 (12:20 +0800)
committerAlex Shi <alex.shi@linaro.org>
Thu, 12 May 2016 04:20:40 +0000 (12:20 +0800)
1  2 
arch/powerpc/kernel/process.c
fs/proc/base.c
mm/page_alloc.c

Simple merge
diff --cc fs/proc/base.c
Simple merge
diff --cc mm/page_alloc.c
Simple merge