Merge branch 'kalimotxo' of qmp.cat:qmpfw into kalimotxo
Conflicts: configs/ath-qmp-big-node configs/ath-qmp-small-node configs/ath-qmp-tiny-node configs/x86-qmp-big-node
Merge branch 'kalimotxo' of qmp.cat:qmpfw into kalimotxo
Conflicts:
configs/ath-qmp-big-node
configs/ath-qmp-small-node
configs/ath-qmp-tiny-node
configs/x86-qmp-big-node