]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
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)
commit05c9ca8843cdf688275df891d512e204359717c5
tree9d9139d62a818ab8d59744fb1211612053d29f98
parentc62af70ff3015a4412c6655de602fdf7f1ecdaa6
parent14327c662822e5e874cb971a7162067519300ca8
Merge branch 'bsym' into for-next

Conflicts:
arch/arm/kernel/head.S
arch/arm/kernel/entry-common.S
arch/arm/kernel/head-nommu.S
arch/arm/kernel/head.S