All of lore.kernel.org
 help / color / mirror / Atom feed
* [KERNEL][linux-yocto PATCH 0/1] merge emgd feature branch into crownbay for 2.6.37
@ 2011-05-12 22:06 Tom Zanussi
  2011-05-12 22:06 ` [KERNEL][linux-yocto PATCH 1/1] bsp/crownbay: merge emgd branch Tom Zanussi
  0 siblings, 1 reply; 2+ messages in thread
From: Tom Zanussi @ 2011-05-12 22:06 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.37.

Please pull into linux-yocto.

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

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] 2+ messages in thread

* [KERNEL][linux-yocto PATCH 1/1] bsp/crownbay: merge emgd branch
  2011-05-12 22:06 [KERNEL][linux-yocto PATCH 0/1] merge emgd feature branch into crownbay for 2.6.37 Tom Zanussi
@ 2011-05-12 22:06 ` Tom Zanussi
  0 siblings, 0 replies; 2+ messages in thread
From: Tom Zanussi @ 2011-05-12 22:06 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] 2+ messages in thread

end of thread, other threads:[~2011-05-12 22:07 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-12 22:06 [KERNEL][linux-yocto PATCH 0/1] merge emgd feature branch into crownbay for 2.6.37 Tom Zanussi
2011-05-12 22:06 ` [KERNEL][linux-yocto PATCH 1/1] bsp/crownbay: merge emgd branch Tom Zanussi

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.