Merge remote-tracking branch 'uniarch/master' into multiarch
authorKeith Packard <keithp@keithp.com>
Fri, 7 Oct 2011 14:40:14 +0000 (08:40 -0600)
committerKeith Packard <keithp@keithp.com>
Fri, 7 Oct 2011 14:40:14 +0000 (08:40 -0600)
commitf6f54d70b768dca1715ddddea64a4df00d82b09e
tree7d38769a1ffe092bc7ac062fb0355f5532e4c016
parent1c344b760776cd5d8c0297d8db9bf02687381b4e
parent0d10e25766b96f5660e213115cf27b71ff164405
Merge remote-tracking branch 'uniarch/master' into multiarch

Conflicts:
src/core/ao_cmd.c

Use ao_arch_reboot after waiting for a second
src/cc1111/ao_packet_slave.c
src/core/ao_cmd.c
src/core/ao_flight.c
src/product/ao_telemetrum.c