tree 18f6dee45d801e57ac9db2a31664b0d5c0762c50
parent d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2
parent e4e7f10bfc4069925e99cc4b428c3434e30b6c3f
author Russell King <rmk+kernel@arm.linux.org.uk> 1381156984 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1381156984 +0100

Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable