From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 4 Dec 2009 17:33:54 +0000 (+0000)
Subject: Merge branch 'for-rmk' of git://git.fluff.org/bjdooks/linux into devel-stable
X-Git-Tag: v2.6.33-rc1~384^2~1^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=602fd7c36728a04e61a442c9755e7d454501266c;p=pandora-kernel.git

Merge branch 'for-rmk' of git://git.fluff.org/bjdooks/linux into devel-stable

Conflicts:
	arch/arm/Kconfig
---

602fd7c36728a04e61a442c9755e7d454501266c
Reading git-diff-tree failed