Merge branch 'pinmap'
authorThomas Ingleby <thomas.c.ingleby@intel.com>
Thu, 1 May 2014 16:37:56 +0000 (17:37 +0100)
committerThomas Ingleby <thomas.c.ingleby@intel.com>
Thu, 1 May 2014 16:37:56 +0000 (17:37 +0100)
commitbe92ed306d87a84ebb9d30c084888ac59c046478
tree4252386cba7e7fc24d7cb389cb194acd5e765118
parent7023a3213a479b834b842c87deea5e19c9223a1f
parentea81a0ba754a81526ab2f0f7d41295962105dac4
Merge branch 'pinmap'

Signed-off-by: Thomas Ingleby <thomas.c.ingleby@intel.com>
Conflicts:
api/maa.h
src/CMakeLists.txt
api/maa.h
examples/cycle-pwm3.c
src/CMakeLists.txt