From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Date: Tue, 2 Jun 2020 19:59:52 +0000 (+0200)
Subject: Merge branch 'next'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a6569f2b3d;p=buildroot.git

Merge branch 'next'

A few conflicts had to be resolved:

 - Version number and hash for mesa3d-headers/mesa3d
 - Patches added in qemu, and the qemu version number
 - The gnuconfig README.buildroot

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---

a6569f2b3dd8b774683fdc0f7df3fcfde0b31f64
diff --cc DEVELOPERS
index efb97c739c,04811b6288..e3ac8aa06a
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@@ -2361,9 -2396,16 +2361,13 @@@ F:	package/libscrypt
  N:	Stephan Hoffmann <sho@relinux.de>
  F:	package/cache-calibrator/
  F:	package/gtest/
 -F:	package/mtdev/
 -F:	package/mtdev2tuio/
 -
 -N:	Stephan Hoffmann <stephan.hoffmann@ext.grandcentrix.net>
  F:	package/libhttpserver/
 +F:	package/mtdev/
  
+ N:	Stephane Viau <stephane.viau@oss.nxp.com>
+ F:	board/freescale/imx8mnevk/
+ F:	configs/freescale_imx8mnevk_defconfig
+ 
  N:	Steve Calfee <stevecalfee@gmail.com>
  F:	package/python-pymysql/
  F:	package/python-pyratemp/