Upating the meta data and machine branch contents with the up
to date merge of utrace.
(From OE-Core rev: cb8efc0e1ec00892b46325aabfb1b4020a46c078)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>