Merge branch 'security-fixes' into fixes
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 1 Aug 2013 19:51:13 +0000 (20:51 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 1 Aug 2013 19:51:13 +0000 (20:51 +0100)

Trivial merge