commit | d302de58484f833699ada16a5d14351100459d04 | [log] [tgz] |
---|---|---|
author | Chih-Wei Huang <cwhuang@linux.org.tw> | Wed May 13 17:35:52 2020 +0800 |
committer | Chih-Wei Huang <cwhuang@linux.org.tw> | Wed May 13 17:35:52 2020 +0800 |
tree | 91ddd593c2dd672da2795f5fb4bbf14abb6caa8f | |
parent | e72ccefdda7dd6f1d8dac32b9cd57f4bf502dcf9 [diff] | |
parent | 75a02cb6155cf8294e4b1408d743ce7b985513f3 [diff] |
Merge remote-tracking branch 'x86/pie-x86' into q-x86 Conflicts: initrd/init