Merge branch 'tingleby-spi-new'
authorBrendan Le Foll <brendan.le.foll@intel.com>
Wed, 30 Apr 2014 13:54:16 +0000 (14:54 +0100)
committerBrendan Le Foll <brendan.le.foll@intel.com>
Wed, 30 Apr 2014 13:54:16 +0000 (14:54 +0100)

Trivial merge