[SQUASH ME] cc2420: fix merge error
Merge branch 'net-dev-base' into network-layer-interface