| commit | bbd56c3b7fe0684e68d81887848516a12d1195f7 | [log] [tgz] |
|---|---|---|
| author | Chih-Wei Huang <cwhuang@linux.org.tw> | Sat Feb 06 14:04:34 2016 +0800 |
| committer | Chih-Wei Huang <cwhuang@linux.org.tw> | Sat Feb 06 14:04:34 2016 +0800 |
| tree | 78188fd06e17619c6b2a3a06f4630fcc4de70748 | |
| parent | 84732737cf5399580b8a8642be0bc9428fb2cddc [diff] | |
| parent | 2796e618bea4b351254e92cd0fc968bd5992389f [diff] |
Merge remote-tracking branch 'x86/kitkat-x86' into marshmallow-x86 Conflicts: initrd/scripts/0-auto-detect