Merge branch 'next'

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

diff --cc linux/linux.mk
Simple merge

diff --cc package/Config.in
Simple merge

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

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

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

diff --cc package/imagemagick/imagemagick.mk
index ab2b7921ba2e85317d8e4567f42c47f1e303cc4d,3a12a9c7abfd570d972fe3a22caac4e594d23ff3..03c1bd4e06978fb1a707fa71cfcb9285b1c41f06
--- 1/package/imagemagick/imagemagick.mk
--- 2/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@@ -4,9 -4,12 +4,9 @@@
  #
  ################################################################################
  
- IMAGEMAGICK_VERSION = 6.9.0-4
+ IMAGEMAGICK_VERSION = 6.9.0-7
  IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz
 -# The official ImageMagick site only keeps the latest versions
 -# available, which is annoying. Use an alternate site that keeps all
 -# older versions.
 -IMAGEMAGICK_SITE = ftp://ftp.nluug.nl/pub/ImageMagick
 +IMAGEMAGICK_SITE = http://www.imagemagick.org/download/releases
  IMAGEMAGICK_LICENSE = Apache-2.0
  IMAGEMAGICK_LICENSE_FILES = LICENSE
  

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

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

diff --cc package/rpi-firmware/rpi-firmware.mk
index 945f890bee8e899e3e37d7076d8c593840a3b495,1db1f0ed015170d9c61eb5bb428ab437b437d5f1..cbcf790095289c4c52886f2abb8f9aa11ce86ce6
--- 1/package/rpi-firmware/rpi-firmware.mk
--- 2/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@@ -11,12 -11,7 +11,8 @@@ RPI_FIRMWARE_LICENSE_FILES = boot/LICEN
  RPI_FIRMWARE_INSTALL_TARGET = NO
  RPI_FIRMWARE_INSTALL_IMAGES = YES
  
- ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS),y)
  RPI_FIRMWARE_DEPENDENCIES += host-rpi-firmware
- # The Device Tree blobs are not yet in the master branch of the
- # raspberrypi firmware project, so we have to use a separate branch
- # for now.
- RPI_FIRMWARE_VERSION = 6c0acfbbdba9908a4a4d21eab63c49ab72cb528b
++
  define RPI_FIRMWARE_INSTALL_DTB
        $(INSTALL) -D -m 0644 $(@D)/boot/bcm2708-rpi-b.dtb $(BINARIES_DIR)/rpi-firmware/bcm2708-rpi-b.dtb
        $(INSTALL) -D -m 0644 $(@D)/boot/bcm2708-rpi-b-plus.dtb $(BINARIES_DIR)/rpi-firmware/bcm2708-rpi-b-plus.dtb

diff --cc package/util-linux/Config.in
Simple merge

diff --cc package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
Simple merge

diff --cc toolchain/toolchain-external/toolchain-external.mk
Simple merge