From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 2 Oct 2009 21:31:04 +0000 (+0100)
Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/xscaleiop
X-Git-Tag: v2.6.32-rc3~11^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=534d0c92cfc45174fbfeca2f3dd54c3ce332725e;p=pandora-kernel.git

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

Conflicts:
	MAINTAINERS
---

534d0c92cfc45174fbfeca2f3dd54c3ce332725e
Reading git-diff-tree failed