From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 16 Mar 2011 23:35:25 +0000 (+0000)
Subject: Merge branch 'misc' into devel
X-Git-Tag: v2.6.39-rc1~463^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd;p=pandora-kernel.git

Merge branch 'misc' into devel

Conflicts:
	arch/arm/Kconfig
---

1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd
Reading git-diff-tree failed