Merge remote-tracking branch 'origin/v4.4/topic/wb-cg2' into linux-linaro-lsk-v4.4
authorAlex Shi <alex.shi@linaro.org>
Tue, 29 Nov 2016 07:58:42 +0000 (15:58 +0800)
committerAlex Shi <alex.shi@linaro.org>
Tue, 29 Nov 2016 07:58:42 +0000 (15:58 +0800)
1  2 
include/linux/mmzone.h

Simple merge