commit | a6569f2b3dd8b774683fdc0f7df3fcfde0b31f64 | [log] [tgz] |
---|---|---|
author | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | Tue Jun 02 21:59:52 2020 +0200 |
committer | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | Tue Jun 02 21:59:52 2020 +0200 |
tree | f325248d77ac11a400aec61e31cbcdfbe7e5c35c | |
parent | d1c67785ef58bc7c77f9b6fb7eadd1ac81c2d6f1 [diff] | |
parent | 4675c7d4418f567e4d23a8935151caa3a8b9e179 [diff] |
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>