Merge remote-tracking branch 'origin/core100' into next

This commit is contained in:
Arne Fitzenreiter
2016-04-19 22:04:24 +02:00
4 changed files with 7 additions and 5 deletions

View File

@@ -1,4 +1,6 @@
boot/config.txt
boot/grub/grub.cfg
boot/grub/grubenv
etc/alternatives
etc/collectd.custom
etc/default/grub