]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commit
projects / thirdparty / openembedded / openembedded-core-contrib.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 943a75a) | patch
linux-yocto/3.10: fix qemuarm build failure
authorBruce Ashfield <bruce.ashfield@windriver.com>
Sun, 30 Mar 2014 19:14:46 +0000 (15:14 -0400)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 30 Mar 2014 22:52:10 +0000 (23:52 +0100)
commit2116e326d9d7039aac4ec6c7ae5d2a2bedfb4a74
tree538a80dd6f616438e4eee654568d47b5d0567d53tree | snapshot
parent943a75a4f3b6877e4092dae14b59b7afef8cad3dcommit | diff
linux-yocto/3.10: fix qemuarm build failure

The v3.10.24 merge created a merge conflict, which was not properly
resolved. Fixing the merge conflict and fixing the build of qemu arm.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-kernel/linux/linux-yocto_3.10.bb diff | blob | blame | history
Mirror of git://git.openembedded.org/openembedded-core-contrib