tree 12fc040daab06ac796c61c1d92bfad9bb054d1c1
parent ba8bb18a03f8c7508565c385576a5431a4ad804a
parent ae72fd588a2b302222769b44775912b83f0785eb
author Russell King <rmk+kernel@arm.linux.org.uk> 1323127217 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1323127217 +0000

Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable

Conflicts:
	arch/arm/common/gic.c
	arch/arm/plat-omap/include/plat/common.h