tree d0f196c53d209f44190fd8a6481823b7770866e6
parent cbd379b10019617457bda31eb243890f4377fa3e
parent 809e660f438fc5a69bf57630a85bcd8112263f37
author Russell King <rmk+kernel@arm.linux.org.uk> 1372502683 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1372502683 +0100

Merge branch 'devel-stable' into for-next

Conflicts:
	arch/arm/Makefile
	arch/arm/include/asm/glue-proc.h