Merge remote-tracking branch 'upstream/edge' into add/SPI-driver-setup
authorJim Morris <morris@wolfman.com>
Fri, 13 Nov 2015 21:46:01 +0000 (13:46 -0800)
committerJim Morris <morris@wolfman.com>
Fri, 13 Nov 2015 21:46:01 +0000 (13:46 -0800)

Trivial merge