diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-07 17:24:32 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-07 17:24:32 +0200 |
| commit | b708ee58f7bef7b479f5b6999a8e976d332691b6 (patch) | |
| tree | 4b13e9706173c676a0278ca1f565bc54b41943a2 /target/x86/kernel | |
| parent | f3cc98651b738ac7f2dc56ea772afa9f874b9d3b (diff) | |
| parent | 7c1f6387d20faf69453a59de6c34227f9f2b833c (diff) | |
resolve merge
Diffstat (limited to 'target/x86/kernel')
| -rw-r--r-- | target/x86/kernel/qemu-x86 (renamed from target/x86/kernel/qemu-i686) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/target/x86/kernel/qemu-i686 b/target/x86/kernel/qemu-x86 index 7eb708745..7eb708745 100644 --- a/target/x86/kernel/qemu-i686 +++ b/target/x86/kernel/qemu-x86 |