Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
authorAlex Shi <alex.shi@linaro.org>
Mon, 16 Jan 2017 04:01:30 +0000 (12:01 +0800)
committerAlex Shi <alex.shi@linaro.org>
Mon, 16 Jan 2017 04:01:30 +0000 (12:01 +0800)
1  2 
mm/page_alloc.c
net/ipv4/fib_frontend.c
net/ipv6/raw.c

diff --cc mm/page_alloc.c
Simple merge
Simple merge
diff --cc net/ipv6/raw.c
Simple merge