Merge branch 'yuyichao-skylake-id' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Wed, 9 Sep 2015 15:48:15 +0000 (10:48 -0500)
committerZhang Xianyi <traits.zhang@gmail.com>
Wed, 9 Sep 2015 15:48:15 +0000 (10:48 -0500)

Trivial merge