Merge branch 'next'

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --cc DEVELOPERS
index f24ef2752e6abdbc4d1c5bb4fafd317dddf10c5a,a8b98407c35390e66a47bcdf07b5c12615165a11..413f37f1c36cb228fbae5be9b6668c7fb77b53f7
--- 1/DEVELOPERS
--- 2/DEVELOPERS
+++ b/DEVELOPERS
@@@ -693,12 -691,10 +696,13 @@@ F:      package/libglib2
  F:    package/libgtk2/
  F:    package/libgtk3/
  F:    package/libidn/
+ F:    package/libidn2/
  F:    package/libjpeg/
 +F:    package/liblockfile/
  F:    package/libmatroska/
  F:    package/libmpdclient/
 +F:    package/libnetfilter_conntrack/
 +F:    package/libnetfilter_queue/
  F:    package/libupnp/
  F:    package/libupnp18/
  F:    package/minissdpd/

diff --cc package/busybox/busybox.mk
Simple merge

diff --cc package/cifs-utils/cifs-utils.mk
Simple merge

diff --cc package/glibc/glibc.mk
Simple merge

diff --cc package/libcurl/libcurl.mk
Simple merge

diff --cc package/ltrace/Config.in
index 2defbe28a0c124b6af1ca7beddad759c3bcca20d,369f54a12ed13833e413f439baa346f970d26a46..667338a26ea9af74dcf2053b0d40ecabc545ccc7
--- 1/package/ltrace/Config.in
--- 2/package/ltrace/Config.in
+++ b/package/ltrace/Config.in
@@@ -1,14 -1,3 +1,15 @@@
 +config BR2_PACKAGE_LTRACE_ARCH_SUPPORTS
 +      bool
++      default y if BR2_aarch64
 +      default y if BR2_arm
 +      default y if BR2_i386
 +      default y if BR2_mips
 +      default y if BR2_mipsel
 +      default y if BR2_powerpc
 +      default y if BR2_sparc
 +      default y if BR2_x86_64
 +      default y if BR2_xtensa
 +
  config BR2_PACKAGE_LTRACE
        bool "ltrace"
        depends on BR2_USE_WCHAR # elfutils

diff --cc package/pkg-generic.mk
Simple merge

diff --cc package/strace/strace.mk
Simple merge

diff --cc package/transmission/transmission.mk
Simple merge

diff --cc package/wget/wget.mk
Simple merge

diff --cc package/zmqpp/zmqpp.mk
Simple merge

diff --cc toolchain/Config.in
Simple merge