Merge branch 'arm/common' into next
authorMatt Fleming <matt.fleming@intel.com>
Wed, 25 Sep 2013 11:50:59 +0000 (12:50 +0100)
committerMatt Fleming <matt.fleming@intel.com>
Wed, 25 Sep 2013 11:50:59 +0000 (12:50 +0100)

Trivial merge