Merge branch 'uek2-next' of git://ca-git.us.oracle.com/linux-snits-public into m...

diff --cc include/linux/mmzone.h
Simple merge

diff --cc kernel/time/ntp.c
Simple merge

diff --cc mm/compaction.c
Simple merge

diff --cc mm/vmscan.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge