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:53:00 +0100 |
| commit | 4f80de9a568bcf0280c7e8b8f89ee6c2adfa477d (patch) | |
| tree | b43b2459a000f9e1295db6c4df038781b0aacd7a /meta-yocto-bsp | |
| parent | b8584fe5c68c004c5e53e5f0a559886adac386ae (diff) | |
| download | openembedded-core-contrib-4f80de9a568bcf0280c7e8b8f89ee6c2adfa477d.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.
(From OE-Core rev: 2116e326d9d7039aac4ec6c7ae5d2a2bedfb4a74)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto-bsp')
0 files changed, 0 insertions, 0 deletions