diff options
| author |   Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-03-30 15:14:46 -0400 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-30 23:52:10 +0100 |
| commit | 2116e326d9d7039aac4ec6c7ae5d2a2bedfb4a74 (patch) | |
| tree | 538a80dd6f616438e4eee654568d47b5d0567d53 /meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb | |
| parent | 943a75a4f3b6877e4092dae14b59b7afef8cad3d (diff) | |
| download | openembedded-core-contrib-2116e326d9d7039aac4ec6c7ae5d2a2bedfb4a74.tar.gz | |
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>
Diffstat (limited to 'meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb')
0 files changed, 0 insertions, 0 deletions