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