| commit | 72bbcacb888545837ddc75fbe0e1ff857cee0c51 | [log] [tgz] |
|---|---|---|
| author | Nguyen Anh Quynh <aquynh@gmail.com> | Mon Sep 15 14:17:49 2014 +0800 |
| committer | Nguyen Anh Quynh <aquynh@gmail.com> | Mon Sep 15 14:17:49 2014 +0800 |
| tree | 089bfdc4a366f7a127f6a5da908a954c53de0812 | |
| parent | f46ef2e0fe08f84a9ffe5bf87e3b2c9d592518b3 [diff] | |
| parent | 2725a3fea818e8a0f28270bbf827c4be13e0aad6 [diff] |
x86: temporarily solve conflicts caused by the last merge