All of lore.kernel.org
 help / color / mirror / Atom feed
* [KERNEL][linux-yocto-dev PATCH 0/1] merge emgd feature branch into crownbay for 2.6.39
@ 2011-05-10 20:48 Tom Zanussi
  2011-05-10 20:48 ` [KERNEL][linux-yocto-dev PATCH] bsp/crownbay: merge emgd branch Tom Zanussi
  2011-05-11 14:59 ` [KERNEL][linux-yocto-dev PATCH 0/1] merge emgd feature branch into crownbay for 2.6.39 Bruce Ashfield
  0 siblings, 2 replies; 3+ messages in thread
From: Tom Zanussi @ 2011-05-10 20:48 UTC (permalink / raw)
  To: bruce.ashfield, poky

From: Tom Zanussi <tom.zanussi@intel.com>

This merges the yocto/emgd topic branch into the crownbay branch for 2.6.39.

Please pull into linux-yocto-dev.

Pull URL: git://git.pokylinux.org/linux-yocto-2.6.37-contrib
  Branch: tzanussi/meta-emgdmerge-2.6.39
  Browse: http://git.pokylinux.org/cgit.cgi/linux-yocto-2.6.37-contrib/log/?h=tzanussi/meta-emgdmerge-2.6.39

Tom Zanussi (1):
  bsp/crownbay: merge emgd branch

 meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)



^ permalink raw reply	[flat|nested] 3+ messages in thread

* [KERNEL][linux-yocto-dev PATCH] bsp/crownbay: merge emgd branch
  2011-05-10 20:48 [KERNEL][linux-yocto-dev PATCH 0/1] merge emgd feature branch into crownbay for 2.6.39 Tom Zanussi
@ 2011-05-10 20:48 ` Tom Zanussi
  2011-05-11 14:59 ` [KERNEL][linux-yocto-dev PATCH 0/1] merge emgd feature branch into crownbay for 2.6.39 Bruce Ashfield
  1 sibling, 0 replies; 3+ messages in thread
From: Tom Zanussi @ 2011-05-10 20:48 UTC (permalink / raw)
  To: bruce.ashfield, poky

From: Tom Zanussi <tom.zanussi@intel.com>

Add scc commands to merge the yocto/emgd branch into the crownbay BSP.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc b/meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc
index 89a0725..0d02b98 100644
--- a/meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc
+++ b/meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc
@@ -1,6 +1,8 @@
 kconf hardware crownbay.cfg
 kconf hardware eg20t.cfg
 
+git merge yocto/emgd
+
 include features/latencytop/latencytop.scc
 include features/profiling/profiling.scc
 include features/serial/8250.scc
-- 
1.7.0.4



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [KERNEL][linux-yocto-dev PATCH 0/1] merge emgd feature branch into crownbay for 2.6.39
  2011-05-10 20:48 [KERNEL][linux-yocto-dev PATCH 0/1] merge emgd feature branch into crownbay for 2.6.39 Tom Zanussi
  2011-05-10 20:48 ` [KERNEL][linux-yocto-dev PATCH] bsp/crownbay: merge emgd branch Tom Zanussi
@ 2011-05-11 14:59 ` Bruce Ashfield
  1 sibling, 0 replies; 3+ messages in thread
From: Bruce Ashfield @ 2011-05-11 14:59 UTC (permalink / raw)
  To: Tom Zanussi; +Cc: poky

On 11-05-10 04:48 PM, Tom Zanussi wrote:
> From: Tom Zanussi<tom.zanussi@intel.com>
>
> This merges the yocto/emgd topic branch into the crownbay branch for 2.6.39.
>
> Please pull into linux-yocto-dev.
>
> Pull URL: git://git.pokylinux.org/linux-yocto-2.6.37-contrib
>    Branch: tzanussi/meta-emgdmerge-2.6.39
>    Browse: http://git.pokylinux.org/cgit.cgi/linux-yocto-2.6.37-contrib/log/?h=tzanussi/meta-emgdmerge-2.6.39

merged, and tested here. works nicely.

Bruce

>
> Tom Zanussi (1):
>    bsp/crownbay: merge emgd branch
>
>   meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc |    2 ++
>   1 files changed, 2 insertions(+), 0 deletions(-)
>



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-05-11 14:59 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-10 20:48 [KERNEL][linux-yocto-dev PATCH 0/1] merge emgd feature branch into crownbay for 2.6.39 Tom Zanussi
2011-05-10 20:48 ` [KERNEL][linux-yocto-dev PATCH] bsp/crownbay: merge emgd branch Tom Zanussi
2011-05-11 14:59 ` [KERNEL][linux-yocto-dev PATCH 0/1] merge emgd feature branch into crownbay for 2.6.39 Bruce Ashfield

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.