scripts/ubinize-image.sh: fix ubinize-image.sh when used with --kernel

r41359 broke support for building ubinized images which do
include a kernel volume.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41368 3c298f89-4303-0410-b956-a3cf2f4a3e73
kernel: xen-kbdfront.ko is at a different path
Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41371 3c298f89-4303-0410-b956-a3cf2f4a3e73
x86/kvm_guest: fix out of sync config-3.10

Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41372 3c298f89-4303-0410-b956-a3cf2f4a3e73
xburst: remove bogus led support override

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41373 3c298f89-4303-0410-b956-a3cf2f4a3e73
eglibc: temporarily disable parallel build until fixed

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41374 3c298f89-4303-0410-b956-a3cf2f4a3e73
px5g-standalone: disable long long to fix compiler errors on mips64

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41375 3c298f89-4303-0410-b956-a3cf2f4a3e73
conntrack-tools: leave out bogus reject files on unpacking

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41376 3c298f89-4303-0410-b956-a3cf2f4a3e73
conntrack-tools: fix build on octeon

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41377 3c298f89-4303-0410-b956-a3cf2f4a3e73
kernel: add missing config symbol

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41378 3c298f89-4303-0410-b956-a3cf2f4a3e73
[mvebu]: update mamba dts

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41379 3c298f89-4303-0410-b956-a3cf2f4a3e73
Merge branch 'master' of git://git.openwrt.org/openwrt