Merge tag 'lsk-v4.4-16.05-android'
authorHuang, Tao <huangtao@rock-chips.com>
Mon, 30 May 2016 06:24:17 +0000 (14:24 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Mon, 30 May 2016 06:24:17 +0000 (14:24 +0800)
LSK 16.05 v4.4-android

1  2 
Makefile
drivers/gpu/drm/i915/intel_crt.c

diff --cc Makefile
Simple merge
Simple merge