Merge remote-tracking branch 'upstream/edge' into add/SPI-driver-setup
authorJim Morris <morris@wolfman.com>
Sun, 29 Nov 2015 02:41:29 +0000 (18:41 -0800)
committerJim Morris <morris@wolfman.com>
Sun, 29 Nov 2015 02:41:29 +0000 (18:41 -0800)

Trivial merge