[meta-freescale] [meta-fsl-arm-extra][PATCH] wandboard: Add Alfonso Tames as maintainer

[Otavio Salvador]

On Tue, Dec 9, 2014 at 4:12 AM, Alfonso Tamés <alfonso at tames.com> wrote:
> Please add me as maintainer for the Wandboards. For now, I can test only the
> Quad and Dual boards but not the Solo since I do not have access to this
> board.
>
> Signed-off-by: Alfonso Tamés <alfonso at tames.com>

I tried to apply this in meta-fsl-arm-extra but it didn't work.

I am getting:

Applying: wandboard: Add Alfonso Tames as maintainer
error: patch failed: conf/machine/wandboard-dual.conf:2
error: conf/machine/wandboard-dual.conf: patch does not apply
error: patch failed: conf/machine/wandboard-quad.conf:2
error: conf/machine/wandboard-quad.conf: patch does not apply
error: patch failed: conf/machine/wandboard-solo.conf:2
error: conf/machine/wandboard-solo.conf: patch does not apply
Patch failed at 0001 wandboard: Add Alfonso Tames as maintainer
The copy of the patch that failed is found in:
   .../sources/meta-fsl-arm-extra/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Please rebase your tree and resend the patch. So we can apply it.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750