merge emgd feature branch into crownbay for 2.6.37

From: Tom Zanussi <[email protected]>

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(-)

From: Tom Zanussi <[email protected]>

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

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

index 89a0725..0d02b98 100644
@@ -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