tree 2f85b8b67dda13d19b02ca39e0fbef921cb1cf8b
parent 2a552d5e63d7fa602c9a9a0717008737f55625a6
parent 846a136881b8f73c1f74250bf6acfaa309cab1f2
author Russell King <rmk+kernel@arm.linux.org.uk> 1349949304 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1349949304 +0100

Merge branch 'fixes' into for-linus

Conflicts:
	arch/arm/kernel/smp.c