tree f41c17eac157b1223ce104845cf9b1e5a9e6a83d
parent 58daf18cdcab550262a5f4681e1f1e073e21965a
parent 4ec3eb13634529c0bc7466658d84d0bbe3244aea
author Russell King <rmk+kernel@arm.linux.org.uk> 1294353172 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1294353172 +0000

Merge branch 'misc' into devel

Conflicts:
	arch/arm/Kconfig
	arch/arm/common/Makefile
	arch/arm/kernel/Makefile
	arch/arm/kernel/smp.c