Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 7 Oct 2013 14:43:04 +0000 (15:43 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 7 Oct 2013 14:43:04 +0000 (15:43 +0100)

Trivial merge