Merge branch 'opendreambox' of git://git.ritzmo.de/openembedded into opendreambox

diff --cc packages/busybox/busybox_1.11.3.bb
index 09eddae,730f421..2340576
--- 1/packages/busybox/busybox_1.11.3.bb
--- 2/packages/busybox/busybox_1.11.3.bb
+++ b/packages/busybox/busybox_1.11.3.bb
@@@ -5,8 -5,11 +5,12 @@@ SRC_URI = "
    http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
    \
    file://udhcpscript.patch;patch=1 \
 +  file://B921600.patch;patch=1 \
    file://fdisk_lineedit_segfault.patch;patch=1 \
+   file://hdparm_M.patch;patch=1 \
+   file://dhcp-hostname.patch;patch=1 \
+   file://keymap_endianess.patch;patch=1 \
+   file://add-getkey-applet.patch;patch=1 \
    file://busybox-cron \
    file://busybox-httpd \
    file://busybox-udhcpd \

diff --cc packages/dbus/dbus.inc
Simple merge