OSDN Git Service

Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 17 Jan 2017 09:38:30 +0000 (17:38 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 17 Jan 2017 09:38:30 +0000 (17:38 +0800)
commit5fb13c2e5f4170a97db59fcfe844f4139cba9ec0
tree610a4312a217f673d7c8d39ba85f46ccce148c9d
parentec2cbcfd10185c102d9d885c03903d642fd760a5
parent17ef541c44d4b432c3d6a8938e20dd51e4749635
Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86