summaryrefslogtreecommitdiff
path: root/BUGS
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-04-04 08:34:02 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2010-04-04 08:34:02 (GMT)
commit5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch)
treecd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /BUGS
parent401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff)
parent4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts: BUGS package/autoconf/Makefile
Diffstat (limited to 'BUGS')
-rw-r--r--BUGS3
1 files changed, 3 insertions, 0 deletions
diff --git a/BUGS b/BUGS
index 0fc8adf..bbb5275 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,8 @@
- openssh on amd64 does not work, ssh-keygen endless loop
- uclibc on lemote mips64 target does not work (only uclibc-trunk with patches)
+<<<<<<< HEAD
- qemu-mips64* targets does not boot, kernel problem?
- (cross-)compile from debian amd64 to f.e. qemu-x86_64 or shuttle with
either glibc or eglibc is broken, have sth. todo with target == host
+=======
+>>>>>>> 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a