Merge branch 'master' into next

diff --git a/config/rootfiles/core/165/exclude b/config/rootfiles/core/165/exclude
index 818039f4af91e75f71ab41de8cd55c54b5274a62..b22e5e943cae4d8b2ec8e72da2d8b747f42e9832 100644 (file)
--- a/config/rootfiles/core/165/exclude
+++ b/config/rootfiles/core/165/exclude
@@ -1,6 +1,7 @@
 boot/config.txt
 boot/grub/grub.cfg
 boot/grub/grubenv
+boot/uEnv.txt
 etc/alternatives
 etc/collectd.custom
 etc/default/grub