Merge branch 'bsym' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 12 Jun 2015 20:18:38 +0000 (21:18 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 12 Jun 2015 20:18:38 +0000 (21:18 +0100)
Conflicts:
arch/arm/kernel/head.S


Trivial merge