Merge remote-tracking branch 'upstream/master' into romfs_clean

Conflicts:
	ROMFS/px4fmu_common/init.d/rc.interface
	ROMFS/px4fmu_common/init.d/rcS
This commit is contained in:
Thomas Gubler
2014-12-13 15:05:56 +01:00
100 changed files with 4591 additions and 3832 deletions
@@ -2,4 +2,4 @@
sh /etc/init.d/rc.fw_defaults
set MIXER FMU_AERT
set MIXER skywalker