| commit | 0ad226e33297559c1bcedca777bbdf9f3e3ff970 | [log] [tgz] |
|---|---|---|
| author | Nguyen Anh Quynh <aquynh@gmail.com> | Fri Jun 06 00:59:15 2014 +0800 |
| committer | Nguyen Anh Quynh <aquynh@gmail.com> | Fri Jun 06 00:59:15 2014 +0800 |
| tree | 4b3d9c16c7ab5f727887c4779831014789191596 | |
| parent | cf0813809afa76600f8b301a2ff481230f67e90f [diff] | |
| parent | 0e534bf0ff6ff7d326f3a9bb176b5012dc854526 [diff] |
x86: fix a conflict when merging -next to -optimize branch