Conflicts: include/intel_galileo_rev_d.h include/intel_galileo_rev_g.h include/mraa_adv_func.h include/mraa_internal.h src/gpio/gpio.c src/mraa.c
Conflicts: include/intel_galileo_rev_d.h include/intel_galileo_rev_g.h include/mraa_adv_func.h include/mraa_internal.h src/gpio/gpio.c src/mraa.c