a1e511
Merge branch 'master' into users/mkubecek/SLE15-SP2/for-next Conflicts: config.conf config/armv7hl/default config/armv7hl/lpae