diff --git a/drivers/mxc/ipu3/ipu_device.c b/drivers/mxc/ipu3/ipu_device.c
index 1098854515d0..2842b91c3fb9 100644
--- a/drivers/mxc/ipu3/ipu_device.c
+++ b/drivers/mxc/ipu3/ipu_device.c
@@ -3138,7 +3138,12 @@ static int ipu_task_thread(void *argv)
 		int split_parent;
 		int split_child;
 
+<<<<<<< HEAD
+		if(wait_event_interruptible(thread_waitq, find_task(&tsk, curr_thread_id)))
+                  break;
+=======
 		wait_event_interruptible(thread_waitq, find_task(&tsk, curr_thread_id));
+>>>>>>> cab446d7433162c4ee2788b05b5e32708f124bf6
 
 		if (!tsk) {
 			pr_err("thread:%d can not find task.\n",
diff --git a/scripts/package/buildtar b/scripts/package/buildtar
index 8a7b15598ea9..7e9f549a0bfd 100644
--- a/scripts/package/buildtar
+++ b/scripts/package/buildtar
@@ -76,6 +76,9 @@ case "${ARCH}" in
 	x86|i386|x86_64)
 		[ -f "${objtree}/arch/x86/boot/bzImage" ] && cp -v -- "${objtree}/arch/x86/boot/bzImage" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
 		;;
+	arm|armel|armhf)
+		[ -f "${objtree}/arch/arm/boot/uImage" ] && cp -v -- "${objtree}/arch/arm/boot/uImage" "${tmpdir}/boot/uImage-${KERNELRELEASE}"
+		;;
 	alpha)
 		[ -f "${objtree}/arch/alpha/boot/vmlinux.gz" ] && cp -v -- "${objtree}/arch/alpha/boot/vmlinux.gz" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
 		;;