emlid/ardupilot — pull request #20 by enter-the-bot (2014-11-14 12:47:41+00:00)
Title: AP_HAL_Linux: style fixes in LinuxSPIUARTDriver

Conflicts:
libraries/AP_HAL_Linux/SPIUARTDriver.cpp