tree 53b86d6fbe1738df3a2cc7e6a892ff8861164e3a
parent 24195cad3e00557da166d629c8b0fd2f984f2170
parent 8c0cc8a5d90bc7373a7a9e7f7a40eb41f51e03fc
author Russell King <rmk+kernel@arm.linux.org.uk> 1375523378 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1375523378 +0100

Merge branch 'security-fixes' into fixes