tree 1bf47bbbd4ea91e343f983b3b50ec2ec73a739e1
parent ec1e20a02fe33b767ffcca8920a32211492416d7
parent 70d42126877b9faa272d446a6de5917614c28dd9
author Russell King <rmk+kernel@arm.linux.org.uk> 1384253939 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1384253939 +0000

Merge branch 'devel-stable' into for-next

Conflicts:
	arch/arm/include/asm/atomic.h
	arch/arm/include/asm/hardirq.h
	arch/arm/kernel/smp.c