Merge branch 'pinmap-aio'
authorThomas Ingleby <thomas.c.ingleby@intel.com>
Fri, 2 May 2014 10:56:02 +0000 (11:56 +0100)
committerThomas Ingleby <thomas.c.ingleby@intel.com>
Fri, 2 May 2014 10:56:02 +0000 (11:56 +0100)

Trivial merge