[yocto] [PATCH 1/2][KERNEL] bsp/fri2: merge emgd branch

[Darren Hart]

On 08/17/2011 09:50 AM, tom.zanussi at intel.com wrote:
> From: Tom Zanussi <tom.zanussi at intel.com>
> 
> Add scc commands to merge the yocto/emgd branch into the fri2 BSP.
> 
> Signed-off-by: Tom Zanussi <tom.zanussi at intel.com>

Acked-by: Darren Hart <dvhart at linux.intel.com>

> ---
>  meta/cfg/kernel-cache/bsp/fri2/fri2.scc |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/meta/cfg/kernel-cache/bsp/fri2/fri2.scc b/meta/cfg/kernel-cache/bsp/fri2/fri2.scc
> index 6ac0bfb..a87ce7e 100644
> --- a/meta/cfg/kernel-cache/bsp/fri2/fri2.scc
> +++ b/meta/cfg/kernel-cache/bsp/fri2/fri2.scc
> @@ -1,5 +1,7 @@
>  kconf hardware fri2.cfg
>  
> +git merge yocto/emgd
> +
>  include features/eg20t/eg20t.scc
>  include features/intel-e1xxxx/intel-e1xxxx.scc
>  include features/dmaengine/dmaengine.scc

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel