OSDN Git Service

Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86 cm-13.0-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Mon, 16 Jan 2017 15:28:38 +0000 (23:28 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Mon, 16 Jan 2017 15:28:38 +0000 (23:28 +0800)

Trivial merge