Merge remote-tracking branch 'origin/master' into master-enea

11 files changed, 16 insertions, 18 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index b7cd2a3d..9c3b3af8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -28,19 +28,19 @@ Maintainers List (try to look for most precise areas first)
 
                 -----------------------------------
 COMMON
-M:      Nitin A Kamble<nitin.a.kamble@intel.com>
+M:      Saul Wold <sgw@linux.intel.com>
 F:      common/
 
 CROWNBAY
-M:      Nitin A Kamble<nitin.a.kamble@intel.com>
+M:      Saul Wold <sgw@linux.intel.com>
 F:      meta-crownbay/
 
 CRYSTALFOREST
-M:      Ong Boon Leong <boon.leong.ong@intel.com>
+M:      Saul Wold <sgw@linux.intel.com>
 F:      meta-crystalforest/
 
 EMENLOW
-M:      Nitin A Kamble<nitin.a.kamble@intel.com>
+M:      Saul Wold <sgw@linux.intel.com>
 F:      meta-emenlow/
 
 FRI2
@@ -48,7 +48,7 @@ M:	Darren Hart <dvhart@linux.intel.com>
 F:      meta-fri2/
 
 JASPERFOREST
-M:      Nitin A Kamble<nitin.a.kamble@intel.com>
+M:      Saul Wold <sgw@linux.intel.com>
 F:      meta-jasperforest/
 
 ROMLEY
@@ -56,9 +56,9 @@ M:      Haw Foo Chien <foo.chien.haw@intel.com>
 F:      meta-romley/
 
 SUGARBAY
-M:      Nitin A Kamble <nitin.a.kamble@intel.com>
+M:      Saul Wold <sgw@linux.intel.com>
 F:      meta-sugarbay/
 
 TLK
-M:      Saul Wold <saul.wold@intel.com>
+M:      Saul Wold <sgw@linux.intel.com>
 F:      meta-tlk/
diff --git a/meta-crownbay/README b/meta-crownbay/README
index d0d9fe6d..03dafb40 100644
--- a/meta-crownbay/README
+++ b/meta-crownbay/README
@@ -47,7 +47,7 @@ Patches
 Please submit any patches against this BSP to the meta-intel mailing list
 (meta-intel@yoctoproject.org) and cc: the maintainer:
 
-Maintainer: Nitin A Kamble <nitin.a.kamble@intel.com>
+Maintainer: Saul Wold <sgw@linux.intel.com>
 
 Please see the meta-intel/MAINTAINERS file for more details.
 
diff --git a/meta-emenlow/README b/meta-emenlow/README
index 0bf0cbcb..eccc9f33 100644
--- a/meta-emenlow/README
+++ b/meta-emenlow/README
@@ -54,7 +54,7 @@ Patches
 Please submit any patches against this BSP to the meta-intel mailing list
 (meta-intel@yoctoproject.org) and cc: the maintainer:
 
-Maintainer: Nitin A Kamble <nitin.a.kamble@intel.com>
+Maintainer: Saul Wold <sgw@linux.intel.com>
 
 Please see the meta-intel/MAINTAINERS file for more details.
 
diff --git a/meta-isg/meta-haswell-wc/README b/meta-isg/meta-haswell-wc/README
index 3e344467..2b7f2753 100644
--- a/meta-isg/meta-haswell-wc/README
+++ b/meta-isg/meta-haswell-wc/README
@@ -49,7 +49,7 @@ Patches
 Please submit any patches against this BSP to the Yocto mailing list
 (meta-intel@yoctoproject.org) and cc: the maintainer:
 
-Maintainer: Ong Boon Leong <boon.leong.ong@intel.com>
+Maintainer: Ng Wei Tee <wei.tee.ng@intel.com>
 
 Please see the meta-intel/MAINTAINERS file for more details.
 
diff --git a/meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf b/meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf
index eef4c130..994181fc 100644
--- a/meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf
+++ b/meta-isg/meta-haswell-wc/conf/machine/haswell-wc.conf
@@ -8,7 +8,7 @@
 # a Shark Bay development kit.
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "3.10%"
+PREFERRED_VERSION_linux-yocto ?= "3.14%"
 
 MACHINE_FEATURES += "pcbios efi va-impl-intel"
 
diff --git a/meta-isg/meta-haswell-wc/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-isg/meta-haswell-wc/recipes-bsp/formfactor/formfactor_0.0.bbappend
index 6644a842..72d991c7 100644
--- a/meta-isg/meta-haswell-wc/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ b/meta-isg/meta-haswell-wc/recipes-bsp/formfactor/formfactor_0.0.bbappend
@@ -1,3 +1 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PRINC := "${@int(PRINC) + 2}"
diff --git a/meta-isg/meta-mohonpeak/conf/machine/mohonpeak32.conf b/meta-isg/meta-mohonpeak/conf/machine/mohonpeak32.conf
index 32ded79c..a103b0e8 100644
--- a/meta-isg/meta-mohonpeak/conf/machine/mohonpeak32.conf
+++ b/meta-isg/meta-mohonpeak/conf/machine/mohonpeak32.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for Mohon Peak systems
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "3.10%"
+PREFERRED_VERSION_linux-yocto ?= "3.14%"
 
 require conf/machine/include/intel-core2-32-common.inc
 require conf/machine/include/intel-common-pkgarch.inc
diff --git a/meta-isg/meta-mohonpeak/conf/machine/mohonpeak64.conf b/meta-isg/meta-mohonpeak/conf/machine/mohonpeak64.conf
index 05e2f6f1..d023c15d 100644
--- a/meta-isg/meta-mohonpeak/conf/machine/mohonpeak64.conf
+++ b/meta-isg/meta-mohonpeak/conf/machine/mohonpeak64.conf
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for Mohon Peak systems
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "3.10%"
+PREFERRED_VERSION_linux-yocto ?= "3.14%"
 
 require conf/machine/include/intel-corei7-64-common.inc
 require conf/machine/include/intel-common-pkgarch.inc
diff --git a/meta-jasperforest/README b/meta-jasperforest/README
index 7e1fe9ca..d82b2af0 100644
--- a/meta-jasperforest/README
+++ b/meta-jasperforest/README
@@ -49,7 +49,7 @@ Patches
 Please submit any patches against this BSP to the meta-intel mailing list
 (meta-intel@yoctoproject.org) and cc: the maintainer:
 
-Maintainer: Nitin A Kamble <nitin.a.kamble@intel.com>
+Maintainer: Saul Wold <sgw@linux.intel.com>
 
 Please see the meta-intel/MAINTAINERS file for more details.
 
diff --git a/meta-nuc/README b/meta-nuc/README
index 20b53f0f..7753755e 100644
--- a/meta-nuc/README
+++ b/meta-nuc/README
@@ -46,7 +46,7 @@ Patches
 Please submit any patches against this BSP to the meta-intel mailing list
 (meta-intel@yoctoproject.org) and cc: the maintainer:
 
-Maintainer: Nitin A Kamble <nitin.a.kamble@intel.com>
+Maintainer: Saul Wold <sgw@linux.intel.com>
 
 Please see the meta-intel/MAINTAINERS file for more details.
 
diff --git a/meta-sugarbay/README b/meta-sugarbay/README
index 3271b8d8..52835196 100644
--- a/meta-sugarbay/README
+++ b/meta-sugarbay/README
@@ -48,7 +48,7 @@ Patches
 Please submit any patches against this BSP to the meta-intel mailing list
 (meta-intel@yoctoproject.org) and cc: the maintainer:
 
-Maintainer: Nitin A Kamble <nitin.a.kamble@intel.com>
+Maintainer: Saul Wold <sgw@linux.intel.com>
 
 Please see the meta-intel/MAINTAINERS file for more details.