Merge remote branch 'freescale/denzil'

* freescale/denzil:
  Move fsl-default*.inc from distro to machine

diff --cc meta-fsl-arm/conf/machine/include/imx-base.inc
index 11457098886d7fc1ecf3e15a8b03923979f35f81,68a191127a1f2229633a175cb410c01401fb29b5..46394302f65f190120380d72c759f8785b7b3565
--- 1/meta-fsl-arm/conf/machine/include/imx-base.inc
--- 2/meta-fsl-arm/conf/machine/include/imx-base.inc
+++ b/meta-fsl-arm/conf/machine/include/imx-base.inc
@@@ -1,12 -1,9 +1,12 @@@
  # Provides the i.MX common settings
  
- include conf/distro/include/fsl-default-settings.inc
- include conf/distro/include/fsl-default-versions.inc
- include conf/distro/include/fsl-default-providers.inc
+ include conf/machine/include/fsl-default-settings.inc
+ include conf/machine/include/fsl-default-versions.inc
+ include conf/machine/include/fsl-default-providers.inc
  
 +# Disable perf features as 2.6.35.3 fail to build otherwise
 +PERF_FEATURES_ENABLE = ""
 +
  # Set specific make target and binary suffix
  UBOOT_MAKE_TARGET = "u-boot.imx"
  UBOOT_SUFFIX = "imx"

diff --cc meta-fsl-arm/conf/machine/include/mxs-base.inc
Simple merge