Merge pull request #115 'athoelke-at:fix-bl31-X1-parameter'
authorDan Handley <dan.handley@arm.com>
Thu, 29 May 2014 16:09:24 +0000 (17:09 +0100)
committerDan Handley <dan.handley@arm.com>
Thu, 29 May 2014 16:09:24 +0000 (17:09 +0100)

Trivial merge