Merge remote-tracking branch 'upstream/edge' into use-pendsv-handler-for-ticker
authorJim Morris <morris@wolfman.com>
Mon, 1 Dec 2014 21:46:07 +0000 (13:46 -0800)
committerJim Morris <morris@wolfman.com>
Mon, 1 Dec 2014 21:46:07 +0000 (13:46 -0800)

Trivial merge