tree b491daac2ccfc7b8ca88e171a43f66888463568a
parent 24056f525051a9e186af28904b396320e18bf9a0
parent 15095bb0fe779c0403091bda7adce5fb3bb9ca35
author Russell King <rmk+kernel@arm.linux.org.uk> 1294353095 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1294353123 +0000

Merge branch 'smp' into misc

Conflicts:
	arch/arm/kernel/entry-armv.S
	arch/arm/mm/ioremap.c