tree c0b8a8185e7473cd96a730c90509f13c96e100af
parent 67f5cd0f6ad86f8faacd0c00ffd0d38f228bad8e
parent 13f7558237ed841b19f11e0920c01c4d6d50fcc5
parent 03fe6692135842d992fe3e599e62bbe72ce08fef
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1215895324 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1215895324 +0100

Merge branches 'pxa-ian' and 'pxa-xm270' into pxa

Conflicts:

	MAINTAINERS