Merge branch 'xgene-fix-mod-crash-and-1g-hotplug'