tree f9c024e6e10807a2c0a372a4705cf7881a1ca919
parent 2103f6cba61a8b8bea3fc1b63661d830a2125e76
parent d9f966357b14e356dbd83b8f4a197a287ab4ff83
author Russell King <rmk+kernel@arm.linux.org.uk> 1376421808 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1376421808 +0100

Merge branch 'security-fixes' into fixes