tree 4aa275fbdbec9c7b9b4629e8bee2bbecd3c6a6af
parent ae19ffbadc1b2100285a5b5b3d0a4e0a11390904
parent 94e0fb086fc5663c38bbc0fe86d698be8314f82f
author Russell King <rmk+kernel@arm.linux.org.uk> 1253823753 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1253823753 +0100

Merge branch 'origin' into for-linus

Conflicts:
	MAINTAINERS