tree 6f944e0878ca6fc71a844a93aabe81c60fe5f693
parent 610ea6c671685a09afff7ba521bdccda21c84c76
parent f00f510ab33f3e689e35ccdbb8dc264168aa5250
author Russell King <rmk+kernel@arm.linux.org.uk> 1254519064 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1254519064 +0100

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/xscaleiop

Conflicts:
	MAINTAINERS