Merge branch 'pwm' into for-pull
authorThomas Ingleby <thomas.c.ingleby@intel.com>
Mon, 14 Apr 2014 16:16:30 +0000 (17:16 +0100)
committerThomas Ingleby <thomas.c.ingleby@intel.com>
Mon, 14 Apr 2014 16:16:30 +0000 (17:16 +0100)

Trivial merge