Merge branch 'kernel31' of code.vuplus.com:/opt/repository/openembedded into kernel31

Conflicts:
	conf/machine/vuultimo.conf
	recipes/enigma2/enigma2.bb
	recipes/vuplus/vuplus-dvb-modules.bb

diff --git a/conf/machine/vuultimo.conf b/conf/machine/vuultimo.conf
index bece491..e978d10 100644 (file)
--- a/conf/machine/vuultimo.conf
+++ b/conf/machine/vuultimo.conf
@@ -79,7 +79,6 @@ MACHINE_FEATURES += "right-half-vfd-skin"
 MACHINE_FEATURES += "enable-rc-kbd"
 
 
-
 EXTRA_IMAGECMD_jffs2 = " --eraseblock=0x20000 -n -l "
 IMAGE_CMD_jffs2 = " \
        cp ${IMAGE_ROOTFS}/boot/vmlinux.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmlinux.gz; \

diff --git a/recipes/vuplus/vuplus-dvb-modules.bb b/recipes/vuplus/vuplus-dvb-modules.bb
index 9322e03..298aaf6 100755 (executable)
--- a/recipes/vuplus/vuplus-dvb-modules.bb
+++ b/recipes/vuplus/vuplus-dvb-modules.bb
@@ -58,7 +58,5 @@ pkg_postinst_vuplus-dvb-modules () {
 }
 
 
-
-
 PACKAGE_ARCH := "${MACHINE_ARCH}"
 FILES_${PN} = "/"