From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 24 Sep 2009 20:22:33 +0000 (+0100)
Subject: Merge branch 'origin' into for-linus
X-Git-Tag: v2.6.32-rc1~49^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=baea7b946f00a291b166ccae7fcfed6c01530cc6;p=pandora-kernel.git

Merge branch 'origin' into for-linus

Conflicts:
	MAINTAINERS
---

baea7b946f00a291b166ccae7fcfed6c01530cc6
Reading git-diff-tree failed