From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 25 Oct 2011 07:19:59 +0000 (+0100)
Subject: Merge branch 'misc' into for-linus
X-Git-Tag: v3.2-rc1~189^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdf4e9482360a3ddc1619efbd5d1c928ede8c3fa;p=pandora-kernel.git

Merge branch 'misc' into for-linus

Conflicts:
	arch/arm/mach-integrator/integrator_ap.c
---

bdf4e9482360a3ddc1619efbd5d1c928ede8c3fa
Reading git-diff-tree failed