OSDN Git Service

Merge remote-tracking branch 'origin/master' into marshmallow-x86 marshmallow-x86 android-x86-6.0-r3
authorChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 19 Apr 2017 09:54:40 +0000 (17:54 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 19 Apr 2017 09:54:40 +0000 (17:54 +0800)
1  2 
xf86drm.c

diff --cc xf86drm.c
Simple merge