From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 6 Jan 2011 22:32:52 +0000 (+0000)
Subject: Merge branch 'misc' into devel
X-Git-Tag: v2.6.38-rc1~471^2~2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4073723acb9cdcdbe4df9c0e0c376c65d1697e43;p=pandora-kernel.git

Merge branch 'misc' into devel

Conflicts:
	arch/arm/Kconfig
	arch/arm/common/Makefile
	arch/arm/kernel/Makefile
	arch/arm/kernel/smp.c
---

4073723acb9cdcdbe4df9c0e0c376c65d1697e43
Reading git-diff-tree failed