tree 117386b9909882c000f822011c5ea6fdcbab3273
parent 95959e6a06720834fc80a210e37898341c63cb91
parent 566b60c04ab230b8cc3845f964306f99504b18df
author Russell King <rmk+kernel@arm.linux.org.uk> 1396568029 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1396568029 +0100

Merge branch 'devel-stable' into for-next